From 415de4ed3383e4fe95f84f66d7d27b82f5e2f342 Mon Sep 17 00:00:00 2001
From: Nicolas Malin <nmalin@apache.org>
Date: Sat, 20 Jun 2015 21:58:05 +0000
Subject: [PATCH] Cleaning forms code is needed after setting default-value in
 list-options and entity-options, patch related to OFBIZ-6524 and follows the
 resolution of OFBIZ-6490 and OFBIZ-6489. Thanks Gil Portenseigne for this
 effort

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1686674 13f79535-47bb-0310-9956-ffa450edef68
---
 .../accounting/widget/AgreementForms.xml      |  26 ++--
 .../accounting/widget/BillingAccountForms.xml |  18 +--
 .../accounting/widget/BudgetForms.xml         |  12 +-
 applications/accounting/widget/CostForms.xml  |  12 +-
 .../accounting/widget/FieldLookupForms.xml    |  18 +--
 .../accounting/widget/FinAccountForms.xml     |  22 +--
 .../accounting/widget/FixedAssetForms.xml     |  36 ++---
 applications/accounting/widget/GlForms.xml    |  44 +++---
 .../accounting/widget/GlSetupForms.xml        |  46 +++---
 .../widget/GlobalGlAccountsForms.xml          |  14 +-
 .../accounting/widget/InvoiceForms.xml        |  34 ++---
 .../accounting/widget/PaymentForms.xml        |  24 +--
 .../widget/PaymentGatewayConfigForms.xml      |   8 +-
 .../accounting/widget/PaymentGroupForms.xml   |  10 +-
 .../widget/ReportFinancialSummaryForms.xml    |  40 ++---
 .../accounting/widget/TaxAuthorityForms.xml   |  10 +-
 .../accounting/widget/TransactionForms.xml    |  24 +--
 .../widget/ap/forms/InvoiceForms.xml          |   6 +-
 .../widget/ap/forms/LookupForms.xml           |   6 +-
 .../widget/ap/forms/VendorForms.xml           |   2 +-
 .../widget/ar/forms/ArPaymentForms.xml        |   4 +-
 .../widget/ar/forms/InvoiceForms.xml          |   2 +-
 .../widget/ar/forms/LookupForms.xml           |   6 +-
 .../widget/ofbizsetup/SetupForms.xml          |   4 +-
 applications/content/widget/cms/CMSForms.xml  |  40 +++--
 .../content/widget/compdoc/CompDocForms.xml   |  16 +-
 .../content/widget/content/ContentForms.xml   |  40 ++---
 .../widget/content/DataResourceForms.xml      |  30 ++--
 .../widget/contentsetup/ContentSetupForms.xml |  11 +-
 .../widget/datasetup/DataSetupForms.xml       |  10 +-
 .../content/widget/forum/ForumForms.xml       |   8 +-
 .../content/widget/layout/LayoutForms.xml     |   3 +-
 .../content/widget/survey/SurveyForms.xml     |   6 +-
 .../widget/website/WebAnalyticsForms.xml      |   2 +-
 .../content/widget/website/WebSiteForms.xml   |   8 +-
 .../humanres/widget/forms/EmplLeaveForms.xml  |  14 +-
 .../widget/forms/EmplPositionForms.xml        |  10 +-
 .../humanres/widget/forms/EmployeeForms.xml   |  24 +--
 .../widget/forms/EmploymentAppForms.xml       |  10 +-
 .../humanres/widget/forms/EmploymentForms.xml |  38 ++---
 .../widget/forms/GlobalHRSettingForms.xml     |  12 +-
 .../humanres/widget/forms/LookupForms.xml     |  12 +-
 .../humanres/widget/forms/PartyQualForms.xml  |  18 +--
 .../humanres/widget/forms/PartySkillForms.xml |   6 +-
 .../humanres/widget/forms/PerfReviewForms.xml |   6 +-
 .../widget/forms/PersonTrainingForms.xml      |   8 +-
 .../widget/forms/RecruitmentForms.xml         |  24 +--
 .../widget/manufacturing/BomForms.xml         |   4 +-
 .../widget/manufacturing/CalendarForms.xml    |   4 +-
 .../widget/manufacturing/CostForms.xml        |   2 +-
 .../widget/manufacturing/MrpForms.xml         |   4 +-
 .../manufacturing/ProductionRunForms.xml      |  42 +++---
 .../widget/manufacturing/RoutingTaskForms.xml |  10 +-
 .../marketing/widget/ContactListForms.xml     |  58 ++++----
 .../marketing/widget/DataSourceForms.xml      |   4 +-
 .../widget/MarketingCampaignForms.xml         |   8 +-
 applications/marketing/widget/ReportForms.xml |  10 +-
 .../marketing/widget/SegmentForms.xml         |   6 +-
 .../marketing/widget/TrackingCodeForms.xml    |  18 +--
 .../widget/sfa/forms/AccountForms.xml         |   2 +-
 .../widget/sfa/forms/ContactForms.xml         |   2 +-
 .../marketing/widget/sfa/forms/LeadForms.xml  |   2 +-
 .../widget/sfa/forms/OpportunityForms.xml     |  16 +-
 .../widget/ordermgr/CustRequestForms.xml      |  42 +++---
 .../widget/ordermgr/FieldLookupForms.xml      |  36 ++---
 .../ordermgr/OrderDeliveryScheduleForms.xml   |   6 +-
 .../order/widget/ordermgr/OrderEntryForms.xml |   2 +-
 .../order/widget/ordermgr/OrderForms.xml      |  14 +-
 .../widget/ordermgr/OrderShopListForms.xml    |   2 +-
 .../widget/ordermgr/PartySettingsForm.xml     |   4 +-
 .../order/widget/ordermgr/QuoteForms.xml      |  26 ++--
 .../widget/ordermgr/QuoteWorkEffortForms.xml  |   4 +-
 .../order/widget/ordermgr/ReportForms.xml     |  10 +-
 .../widget/ordermgr/RequirementForms.xml      |  14 +-
 .../order/widget/ordermgr/ReturnForms.xml     |  20 +--
 .../partymgr/CommunicationEventForms.xml      |  72 ++++-----
 .../party/widget/partymgr/LookupForms.xml     |  38 ++---
 .../partymgr/PartyClassificationForms.xml     |   8 +-
 .../widget/partymgr/PartyContactListForms.xml |   8 +-
 .../party/widget/partymgr/PartyForms.xml      |  80 +++++-----
 .../widget/partymgr/PartyInvitationForms.xml  |   8 +-
 .../product/widget/catalog/CategoryForms.xml  |  12 +-
 .../product/widget/catalog/ConfigForms.xml    |   6 +-
 .../product/widget/catalog/FeatureForms.xml   |  18 +--
 .../widget/catalog/FieldLookupForms.xml       |  24 +--
 .../widget/catalog/ImageManagementForms.xml   |  22 +--
 .../product/widget/catalog/PriceForms.xml     |  12 +-
 .../widget/catalog/ProdCatalogForms.xml       |   6 +-
 .../product/widget/catalog/ProductForms.xml   | 138 +++++++++---------
 .../widget/catalog/ProductStoreForms.xml      |  78 +++++-----
 .../product/widget/catalog/PromoForms.xml     |   2 +-
 .../product/widget/catalog/ReviewForms.xml    |   2 +-
 .../product/widget/catalog/ShippingForms.xml  |   4 +-
 .../product/widget/catalog/StoreForms.xml     |   6 +-
 .../widget/catalog/SubscriptionForms.xml      |  50 +++----
 .../product/widget/facility/FacilityForms.xml |  38 ++---
 .../widget/facility/FacilityGroupForms.xml    |   4 +-
 .../widget/facility/FieldLookupForms.xml      |  14 +-
 .../widget/facility/InventoryForms.xml        |  14 +-
 .../product/widget/facility/ShipmentForms.xml |   4 +-
 .../facility/ShipmentGatewayConfigForms.xml   |   8 +-
 .../workeffort/widget/CalendarForms.xml       |  24 +--
 .../workeffort/widget/LookupForms.xml         |  10 +-
 .../workeffort/widget/TimesheetForms.xml      |  10 +-
 .../workeffort/widget/WorkEffortForms.xml     |  98 ++++++-------
 .../widget/WorkEffortPartyAssignForms.xml     |  18 +--
 .../widget/WorkEffortRequirementForms.xml     |   2 +-
 framework/common/widget/LookupForms.xml       |   4 +-
 .../webtools/widget/GeoManagementForms.xml    |   6 +-
 framework/webtools/widget/ServiceForms.xml    |   4 +-
 .../widget/forms/FixedAssetForms.xml          |   8 +-
 .../assetmaint/widget/forms/ProductForms.xml  |   6 +-
 .../widget/forms/WorkEffortForms.xml          |  26 ++--
 .../widget/ismgr/FieldLookupForms.xml         |   4 +-
 .../widget/ismgr/FixedAssetForms.xml          |   4 +-
 .../birt/widget/facility/FacilityForms.xml    |   6 +-
 .../birt/widget/order/OrderForms.xml          |   2 +-
 specialpurpose/ebay/widget/EbayForms.xml      |   8 +-
 .../widget/EbaySellingManagerForms.xml        |   2 +-
 .../ecommerce/widget/ForumForms.xml           |  26 ++--
 .../widget/example/ExampleFeatureForms.xml    |   4 +-
 .../example/widget/example/ExampleForms.xml   |  14 +-
 .../widget/example/FormWidgetExampleForms.xml |  13 +-
 .../googlebase/widget/GoogleBaseForms.xml     |   2 +-
 .../widget/GoogleCheckoutForms.xml            |  12 +-
 .../oagis/widget/forms/MessageInfoForms.xml   |   2 +-
 .../widget/forms/CustRequestForms.xml         |   4 +-
 .../projectmgr/widget/forms/ProjectForms.xml  |  56 +++----
 .../projectmgr/widget/forms/ResourceForms.xml |   4 +-
 .../projectmgr/widget/forms/TaskForms.xml     |  46 +++---
 .../widget/forms/TimeSheetForms.xml           |  16 +-
 .../scrum/widget/CommunicationEventForms.xml  |   2 +-
 .../scrum/widget/FieldLookupForms.xml         |   2 +-
 specialpurpose/scrum/widget/MyWorkForms.xml   |   8 +-
 specialpurpose/scrum/widget/OpenTestForms.xml |  12 +-
 specialpurpose/scrum/widget/ProjectForms.xml  |   6 +-
 specialpurpose/scrum/widget/ResourceForms.xml |  18 +--
 specialpurpose/scrum/widget/TaskForms.xml     |  36 ++---
 .../scrum/widget/TimeSheetForms.xml           |  10 +-
 specialpurpose/scrum/widget/scrumForms.xml    |  78 +++++-----
 140 files changed, 1214 insertions(+), 1231 deletions(-)

diff --git a/applications/accounting/widget/AgreementForms.xml b/applications/accounting/widget/AgreementForms.xml
index 3b15d65c834..279ed422652 100644
--- a/applications/accounting/widget/AgreementForms.xml
+++ b/applications/accounting/widget/AgreementForms.xml
@@ -28,7 +28,7 @@ under the License.
         </field>
         <field name="agreementTypeId" title="${uiLabelMap.AccountingAgreementTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="AgreementType"/>
+                <entity-options entity-name="AgreementType"/>
             </drop-down>
         </field>
         <field name="partyIdFrom" title="${uiLabelMap.AccountingPartyIdFrom}">
@@ -120,7 +120,7 @@ under the License.
         </field>
         <field name="agreementTypeId" title="${uiLabelMap.AccountingAgreementTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="AgreementType" key-field-name="agreementTypeId"/>
+                <entity-options entity-name="AgreementType" key-field-name="agreementTypeId"/>
             </drop-down>
         </field>
         <field name="partyIdFrom" title="${uiLabelMap.AccountingPartyIdFrom}">
@@ -128,12 +128,12 @@ under the License.
         </field>
         <field name="roleTypeIdFrom" title="${uiLabelMap.AccountingRoleTypeIdFrom}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId"/>
             </drop-down>
         </field>
         <field name="roleTypeIdTo" title="${uiLabelMap.AccountingRoleTypeIdTo}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId"/>
             </drop-down>
         </field>
         <field name="partyIdTo" title="${uiLabelMap.AccountingPartyIdTo}">
@@ -175,7 +175,7 @@ under the License.
         <field name="agreementItemSeqId" use-when="agreementItem==null" ><ignored/></field>
         <field name="agreementItemTypeId" title="${uiLabelMap.AccountingAgreementItemTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="AgreementItemType" key-field-name="agreementItemTypeId"/>
+                <entity-options entity-name="AgreementItemType" key-field-name="agreementItemTypeId"/>
             </drop-down>
         </field>
         <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}">
@@ -235,7 +235,7 @@ under the License.
         </field>
         <field name="invoiceItemTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="InvoiceItemType" description="${description}">
+                <entity-options entity-name="InvoiceItemType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -254,7 +254,7 @@ under the License.
         <field name="agreementTermId" title="${uiLabelMap.AccountingAgreementTermId}"><hidden/></field>
         <field name="termTypeId" title="${uiLabelMap.AccountingTermTypeId}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="TermType" description="${description}">
+                <entity-options entity-name="TermType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -263,7 +263,7 @@ under the License.
         <field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
         <field name="invoiceItemTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="InvoiceItemType" description="${description}">
+                <entity-options entity-name="InvoiceItemType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -279,14 +279,14 @@ under the License.
         <field name="agreementTermId" title="${uiLabelMap.AccountingAgreementTermId}"><display/></field>
         <field name="termTypeId" title="${uiLabelMap.AccountingTermTypeId}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="TermType" description="${description}"/>
+                <entity-options entity-name="TermType"/>
             </drop-down>
         </field>
         <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
         <field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
         <field name="invoiceItemTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="InvoiceItemType" description="${description}">
+                <entity-options entity-name="InvoiceItemType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -465,14 +465,14 @@ under the License.
         <field name="productId" use-when="agreementProductAppl!=null"><display/></field>
         <field name="supplierPrefOrderId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="SupplierPrefOrder" key-field-name="supplierPrefOrderId" description="${description}">
+                <entity-options entity-name="SupplierPrefOrder" key-field-name="supplierPrefOrderId">
                     <entity-order-by field-name="supplierPrefOrderId"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="supplierRatingTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="SupplierRatingType" key-field-name="supplierRatingTypeId" description="${description}">
+                <entity-options entity-name="SupplierRatingType" key-field-name="supplierRatingTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -669,7 +669,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
diff --git a/applications/accounting/widget/BillingAccountForms.xml b/applications/accounting/widget/BillingAccountForms.xml
index 701a96996c9..b1db6760baa 100644
--- a/applications/accounting/widget/BillingAccountForms.xml
+++ b/applications/accounting/widget/BillingAccountForms.xml
@@ -176,7 +176,7 @@ under the License.
             </display-entity>
         </field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}">
-            <display-entity entity-name="RoleType" description="${description}"/>
+            <display-entity entity-name="RoleType"/>
         </field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
 
@@ -196,7 +196,7 @@ under the License.
         <field name="billingAccountId"><hidden/></field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}">
             <drop-down allow-empty="false" no-current-selected-key="BILL_TO_CUSTOMER">
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -214,11 +214,11 @@ under the License.
         </actions>
         <field name="billingAccountId"><hidden/></field>
         <field name="termTypeId" title="${uiLabelMap.PartyTermType}">
-            <display-entity entity-name="TermType" description="${description}"/>
+            <display-entity entity-name="TermType"/>
         </field>
         <field name="termValue" title="${uiLabelMap.CommonValue}"><display/></field>
         <field name="uomId" title="${uiLabelMap.CommonUom}">
-            <display-entity entity-name="Uom" description="${description}"/>
+            <display-entity entity-name="Uom"/>
         </field>
         <field name="billingAccountTermId" title=" " widget-style="buttontext">
             <hyperlink description="${uiLabelMap.CommonEdit}" target="EditBillingAccountTerms">
@@ -240,7 +240,7 @@ under the License.
         <field use-when="billingAccountTermId!=null" name="billingAccountTermId"><hidden/></field>
         <field name="termTypeId" title="${uiLabelMap.PartyTermType}">
             <drop-down>
-                <entity-options entity-name="TermType" description="${description}">
+                <entity-options entity-name="TermType">
                     <entity-constraint name="parentTypeId" value="FINANCIAL_TERM"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -248,7 +248,7 @@ under the License.
         </field>
         <field name="uomId" title="${uiLabelMap.CommonUom}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Uom" description="${description}">
+                <entity-options entity-name="Uom">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -269,7 +269,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="paymentMethodTypeId" title="${uiLabelMap.CommonType}">
-            <display-entity entity-name="PaymentMethodType" description="${description}"/>
+            <display-entity entity-name="PaymentMethodType"/>
         </field>
         <field name="invoiceId"><display/></field>
         <field name="invoiceItemSeqId"><display/></field>
@@ -300,14 +300,14 @@ under the License.
         </field>
         <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}">
             <drop-down allow-empty="false" no-current-selected-key="CUSTOMER_DEPOSIT">
-                <entity-options description="${description}" entity-name="PaymentType">
+                <entity-options entity-name="PaymentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="paymentMethodTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="PaymentMethodType" description="${description}">
+                <entity-options entity-name="PaymentMethodType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/accounting/widget/BudgetForms.xml b/applications/accounting/widget/BudgetForms.xml
index 61ef72120c0..7eaec962d49 100644
--- a/applications/accounting/widget/BudgetForms.xml
+++ b/applications/accounting/widget/BudgetForms.xml
@@ -60,7 +60,7 @@ under the License.
         <field use-when="budget != null" name="budgetId"><display/></field>
         <field name="budgetTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="BudgetType" description="${description}">
+                <entity-options entity-name="BudgetType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -83,7 +83,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="budgetId"><hidden/></field>
         <field name="statusDate"><display/></field>
-        <field name="statusId" title="${uiLabelMap.AccountingBudgetStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="statusId" title="${uiLabelMap.AccountingBudgetStatus}"><display-entity entity-name="StatusItem"/></field>
     </form>
     
     <form name="BudgetRoles" type="list" use-row-submit="true" title="" list-name="budgetRoles" paginate-target="BudgetOverview"
@@ -144,7 +144,7 @@ under the License.
         </field>
        <field name="budgetItemTypeId">
            <drop-down allow-empty="false">
-               <entity-options entity-name="BudgetItemType" description="${description}" key-field-name="budgetItemTypeId"/>
+               <entity-options entity-name="BudgetItemType" key-field-name="budgetItemTypeId"/>
            </drop-down>
        </field>
        <field name="amount" ><text size="10"/></field>
@@ -166,7 +166,7 @@ under the License.
         <field name="budgetId"><hidden/></field>
        <field name="budgetItemTypeId">
            <drop-down allow-empty="false">
-               <entity-options entity-name="BudgetItemType" description="${description}" key-field-name="budgetItemTypeId"/>
+               <entity-options entity-name="BudgetItemType" key-field-name="budgetItemTypeId"/>
            </drop-down>
        </field>
        <field name="amount" ><text size="10"/></field>
@@ -187,7 +187,7 @@ under the License.
         <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="RoleType">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -226,7 +226,7 @@ under the License.
         <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="budgetReviewResultTypeId" title="${uiLabelMap.AccountingBudgetReviewResult}">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="BudgetReviewResultType">
+                <entity-options entity-name="BudgetReviewResultType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/accounting/widget/CostForms.xml b/applications/accounting/widget/CostForms.xml
index 47b79bd82b2..b26707183f2 100644
--- a/applications/accounting/widget/CostForms.xml
+++ b/applications/accounting/widget/CostForms.xml
@@ -26,16 +26,16 @@ under the License.
         <field name="costComponentCalcId" widget-style="buttontext"></field>
         <field name="costGlAccountTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId" description="${description}"/>
+                <entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId"/>
             </drop-down>
         </field>
         <field name="offsettingGlAccountTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId" description="${description}"/>
+                <entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId"/>
             </drop-down>
         </field>
         <field name="updateCostComponentCalc" title="${uiLabelMap.CommonUpdate}"><submit/></field>
-        <field name="costCustomMethodId"><display-entity entity-name="CustomMethod" key-field-name="customMethodId" description="${description}"/></field>
+        <field name="costCustomMethodId"><display-entity entity-name="CustomMethod" key-field-name="customMethodId"/></field>
         <field name="deleteCostComponentCalc" title=" " widget-style="buttontext">
             <hyperlink target="deleteCostComponentCalc" description="${uiLabelMap.CommonDelete}" also-hidden="false">
                 <parameter param-name="costComponentCalcId"/>
@@ -47,12 +47,12 @@ under the License.
         <auto-fields-service service-name="createCostComponentCalc"/>
         <field name="costGlAccountTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId" description="${description}"/>
+                <entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId"/>
             </drop-down>
         </field>
         <field name="offsettingGlAccountTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId" description="${description}"/>
+                <entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId"/>
             </drop-down>
         </field>
         <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}">
@@ -65,7 +65,7 @@ under the License.
         </field>
         <field name="costCustomMethodId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="CustomMethod" key-field-name="customMethodId" description="${description}">
+                <entity-options entity-name="CustomMethod" key-field-name="customMethodId">
                     <entity-constraint name="customMethodTypeId" operator="equals" value="COST_FORMULA"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/accounting/widget/FieldLookupForms.xml b/applications/accounting/widget/FieldLookupForms.xml
index 67654eca6fe..0725ade1e56 100644
--- a/applications/accounting/widget/FieldLookupForms.xml
+++ b/applications/accounting/widget/FieldLookupForms.xml
@@ -28,7 +28,7 @@ under the License.
         <field name="fixedAssetName"><text-find/></field>
         <field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedAssetTypeId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="FixedAssetType" description="${description}">
+                <entity-options entity-name="FixedAssetType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
              </drop-down>
@@ -58,7 +58,7 @@ under the License.
         <field name="budgetId"><text-find/></field>
         <field name="budgetTypeId" title="${uiLabelMap.AccountingBudgetType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="BudgetType" description="${description}">
+                <entity-options entity-name="BudgetType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
              </drop-down>
@@ -119,14 +119,14 @@ under the License.
         <field name="accountName" title="${uiLabelMap.CommonName}"><text-find/></field>
         <field name="glAccountTypeId" title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="GlAccountType" description="${description}">
+                <entity-options entity-name="GlAccountType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="glAccountClassId" title="${uiLabelMap.AccountingGlAccountClass}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="GlAccountClass" description="${description}">
+                <entity-options entity-name="GlAccountClass">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -188,12 +188,12 @@ under the License.
         <field position="1" name="invoiceId" ><text-find/></field>
         <field position="1" name="invoiceTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="InvoiceType"/>
+                <entity-options entity-name="InvoiceType"/>
             </drop-down>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="INVOICE_STATUS"/>
                 </entity-options>
             </drop-down>
@@ -220,7 +220,7 @@ under the License.
             <hyperlink also-hidden="false" target-type="plain" description="${invoiceId}" target="javascript:set_value('${invoiceId}')"/>
         </field>
         <field name="invoiceTypeId"><display-entity entity-name="InvoiceType"/></field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
         <field name="description"><display/></field>
         <field name="partyIdFrom"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}[${partyId}]"/></field>
         <field name="partyId" title="${uiLabelMap.AccountingPartyIdTo}"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}[${partyId}]"/></field>
@@ -263,7 +263,7 @@ under the License.
         <field name="agreementItemSeqId"><text-find/></field>
         <field name="agreementItemTypeId" title="${uiLabelMap.FormFieldTitle_agreementItemType}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="AgreementItemType"/>
+                <entity-options entity-name="AgreementItemType"/>
             </drop-down>
         </field>
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
@@ -348,7 +348,7 @@ under the License.
         <field name="parentPeriodId"><text-find/></field>
         <field name="periodTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="PeriodType" description="${description}">
+                <entity-options entity-name="PeriodType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
              </drop-down>
diff --git a/applications/accounting/widget/FinAccountForms.xml b/applications/accounting/widget/FinAccountForms.xml
index 0747999dcde..e0d6f63a1b9 100644
--- a/applications/accounting/widget/FinAccountForms.xml
+++ b/applications/accounting/widget/FinAccountForms.xml
@@ -27,7 +27,7 @@ under the License.
         <field name="finAccountId"><text-find ignore-case="true"/></field>
         <field name="finAccountTypeId" title="${uiLabelMap.FormFieldTitle_finAccountType}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="FinAccountType">
+                <entity-options entity-name="FinAccountType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -98,7 +98,7 @@ under the License.
         <field name="finAccountPin"><text size="10"/></field>
         <field name="finAccountTypeId" title="${uiLabelMap.FormFieldTitle_finAccountType}">
             <drop-down no-current-selected-key="DEPOSIT_ACCOUNT">
-                <entity-options description="${description}" entity-name="FinAccountType">
+                <entity-options entity-name="FinAccountType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -116,7 +116,7 @@ under the License.
         <field name="postToGlAccountId"><lookup target-form-name="LookupGlAccount"/></field>
         <field name="statusId" use-when="finAccount==null" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="FINACCT_STATUS"/>
 
                 </entity-options>
@@ -169,7 +169,7 @@ under the License.
         <field name="partyId"> <lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -189,7 +189,7 @@ under the License.
         <field name="finAccountTransId"><hidden/></field>
         <field name="finAccountTransTypeId">
             <drop-down no-current-selected-key="ADJUSTMENT">
-                <entity-options description="${description}" entity-name="FinAccountTransType">
+                <entity-options entity-name="FinAccountTransType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -201,7 +201,7 @@ under the License.
         <field name="orderId"><lookup target-form-name="LookupOrderHeader"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down>
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="FINACT_TRNS_STATUS"/>
                 </entity-options>
             </drop-down>
@@ -300,7 +300,7 @@ under the License.
         <field name="finAccountId"><text-find ignore-case="true"/></field>
         <field name="finAccountTypeId" title="${uiLabelMap.FormFieldTitle_finAccountType}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="FinAccountType">
+                <entity-options entity-name="FinAccountType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -320,14 +320,14 @@ under the License.
         <field name="finAccountId"><hidden value="${finAccountId}"/></field>
         <field name="finAccountTransTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="FinAccountTransType">
+                <entity-options entity-name="FinAccountTransType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="FINACT_TRNS_STATUS"/>
                 </entity-options>
             </drop-down>
@@ -363,7 +363,7 @@ under the License.
         </actions>
         <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="PaymentType" description="${description}">
+                <entity-options entity-name="PaymentType">
                     <entity-constraint name="parentTypeId" operator="equals" env-name="parentTypeId"/>
                 </entity-options>
             </drop-down>
@@ -449,7 +449,7 @@ under the License.
         <field name="glReconciliationName"><text/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="GLREC_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
diff --git a/applications/accounting/widget/FixedAssetForms.xml b/applications/accounting/widget/FixedAssetForms.xml
index 6766883e84e..352db400fc7 100644
--- a/applications/accounting/widget/FixedAssetForms.xml
+++ b/applications/accounting/widget/FixedAssetForms.xml
@@ -80,7 +80,7 @@ under the License.
 
         <field name="fixedAssetTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="FixedAssetType" description="${description}">
+                <entity-options entity-name="FixedAssetType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -88,7 +88,7 @@ under the License.
         <field name="instanceOfProductId"><lookup target-form-name="LookupProduct"/></field>
         <field name="classEnumId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="FXAST_CLASS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -97,7 +97,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPerson"/></field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -151,7 +151,7 @@ under the License.
         <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct"/></field>
         <field name="fixedAssetProductTypeId" title="${uiLabelMap.AccountingFixedAssetProductTypeId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="FixedAssetProductType" description="${description}">
+                <entity-options entity-name="FixedAssetProductType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -172,13 +172,13 @@ under the License.
         <field name="workEffortId"><display/></field>
         <field name="workEffortName" title="${uiLabelMap.CommonName}"><display/></field>
         <field name="workEffortTypeId" title="${uiLabelMap.CommonType}">
-            <display-entity entity-name="WorkEffortType" description="${description}"/>
+            <display-entity entity-name="WorkEffortType"/>
         </field>
         <field name="workEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}">
-            <display-entity entity-name="WorkEffortPurposeType" description="${description}"/>
+            <display-entity entity-name="WorkEffortPurposeType"/>
         </field>
         <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="percentComplete"><display/></field>
         <field name="estimatedStartDate"><display/></field>
@@ -224,7 +224,7 @@ under the License.
         <field name="fixedAssetId"><hidden/></field>
         <field name="fixedAssetStdCostTypeId" title="${uiLabelMap.AccountingFixedAssetStdCostTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="FixedAssetStdCostType" key-field-name="fixedAssetStdCostTypeId"/>
+                <entity-options entity-name="FixedAssetStdCostType" key-field-name="fixedAssetStdCostTypeId"/>
             </drop-down>
         </field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"/>
@@ -269,7 +269,7 @@ under the License.
         <field name="fixedAssetId"><hidden/></field>
         <field name="fixedAssetIdentTypeId" title="${uiLabelMap.AccountingFixedAssetIdentType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="FixedAssetIdentType" description="${description}">
+                <entity-options entity-name="FixedAssetIdentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -353,7 +353,7 @@ under the License.
         <field use-when="fixedAssetMaint!=null" title="${uiLabelMap.CommonCreated}" name="createdStamp"><display/></field>
         <field name="statusId" use-when="fixedAssetMaint==null" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="FIXEDAST_MNT_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -369,7 +369,7 @@ under the License.
         </field>
         <field name="productMaintTypeId" title="${uiLabelMap.AccountingFixedAssetMaintType}" tooltip="${uiLabelMap.AccountingFixedAssetMaintMessage1}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ProductMaintType">
+                <entity-options entity-name="ProductMaintType">
                     <entity-order-by field-name="productMaintTypeId"/>
                 </entity-options>
             </drop-down>
@@ -387,7 +387,7 @@ under the License.
         </field>
         <field name="intervalMeterTypeId" title="${uiLabelMap.AccountingFixedAssetMaintIntervalMeterType}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ProductMeterType" key-field-name="productMeterTypeId">
+                <entity-options entity-name="ProductMeterType" key-field-name="productMeterTypeId">
                     <entity-order-by field-name="productMeterTypeId"/>
                 </entity-options>
             </drop-down>
@@ -430,7 +430,7 @@ under the License.
         </actions>
         <field name="fixedAssetId"><hidden/></field>
         <field name="productMeterTypeId">
-            <display-entity entity-name="ProductMeterType" key-field-name="productMeterTypeId" description="${description}"/>
+            <display-entity entity-name="ProductMeterType" key-field-name="productMeterTypeId"/>
         </field>
         <field name="readingDate"><display/></field>
         <field name="meterValue" title="${uiLabelMap.AccountingFixedAssetMeterValue}"><text/></field>
@@ -459,7 +459,7 @@ under the License.
         <field name="maintHistSeqId" use-when="maintHistSeqId == null"><ignored/></field>
         <field name="productMeterTypeId" >
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ProductMeterType" key-field-name="productMeterTypeId">
+                <entity-options entity-name="ProductMeterType" key-field-name="productMeterTypeId">
                     <entity-order-by field-name="productMeterTypeId"/>
                 </entity-options>
             </drop-down>
@@ -530,7 +530,7 @@ under the License.
         <field name="allocatedDate"><date-time/></field>
         <field name="statusId" title="${uiLabelMap.FormFieldTitle_statusId}">
             <drop-down allow-empty="false">
-                 <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                 <entity-options entity-name="StatusItem" key-field-name="statusId">
                      <entity-constraint name="statusTypeId" value="PRTYASGN_STATUS"/>
                      <entity-order-by field-name="statusId"/>
                  </entity-options>
@@ -559,14 +559,14 @@ under the License.
          </field>
          <field name="roleTypeId">
              <drop-down allow-empty="true">
-                 <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                 <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                      <entity-order-by field-name="roleTypeId"/>
                  </entity-options>
              </drop-down>
          </field>
          <field name="statusId">
              <drop-down allow-empty="false">
-                 <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                 <entity-options entity-name="StatusItem" key-field-name="statusId">
                      <entity-constraint name="statusTypeId" value="PRTYASGN_STATUS"/>
                      <entity-order-by field-name="statusId"/>
                  </entity-options>
@@ -581,7 +581,7 @@ under the License.
         <field name="fixedAssetId"><hidden/></field>
         <field name="depreciationCustomMethodId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="CustomMethod" key-field-name="customMethodId" description="${description}">
+                <entity-options entity-name="CustomMethod" key-field-name="customMethodId">
                     <entity-constraint name="customMethodTypeId" operator="equals" value="DEPRECIATION_FORMULA"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/accounting/widget/GlForms.xml b/applications/accounting/widget/GlForms.xml
index 5e2f161c6d8..0e2451b68fb 100644
--- a/applications/accounting/widget/GlForms.xml
+++ b/applications/accounting/widget/GlForms.xml
@@ -29,14 +29,14 @@ under the License.
         </field>
         <field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}" position="2">
             <drop-down allow-empty="true">
-                <entity-options entity-name="AcctgTransType" description="${description}">
+                <entity-options entity-name="AcctgTransType">
                     <entity-order-by field-name="acctgTransTypeId"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}" position="1">
             <drop-down allow-empty="true">
-                <entity-options entity-name="GlFiscalType" description="${description}">
+                <entity-options entity-name="GlFiscalType">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -206,14 +206,14 @@ under the License.
         </field>
         <field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="AcctgTransType" description="${description}">
+                <entity-options entity-name="AcctgTransType">
                     <entity-order-by field-name="acctgTransTypeId"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="GlFiscalType" description="${description}">
+                <entity-options entity-name="GlFiscalType">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -430,14 +430,14 @@ under the License.
         <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
         <field name="acctgTransTypeId" title="${uiLabelMap.FormFieldTitle_acctgTransType}" position="1">
             <drop-down>
-                <entity-options entity-name="AcctgTransType" description="${description}">
+                <entity-options entity-name="AcctgTransType">
                     <entity-order-by field-name="acctgTransTypeId"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}" position="2">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" description="${description}">
+                <entity-options entity-name="GlFiscalType">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -447,7 +447,7 @@ under the License.
         </field>
         <field name="roleTypeId" parameter-name="roleTypeId" position="2">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" key-field-name="roleTypeId" description="${description}">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="roleTypeId"/>
                 </entity-options>
             </drop-down>
@@ -511,21 +511,21 @@ under the License.
         <field name="organizationPartyId" map-name="parameter"><hidden/></field>
         <field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}">
             <drop-down>
-                <entity-options entity-name="AcctgTransType" description="${description}">
+                <entity-options entity-name="AcctgTransType">
                     <entity-order-by field-name="acctgTransTypeId"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" description="${description}">
+                <entity-options entity-name="GlFiscalType">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="roleTypeId"/>
                 </entity-options>
             </drop-down>
@@ -547,7 +547,7 @@ under the License.
         <field name="inventoryItemId"><text/></field>
         <field name="groupStatusId" title="${uiLabelMap.FormFieldTitle_groupStatus}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -572,7 +572,7 @@ under the License.
         <field name="acctgTransEntryTypeId" ><hidden value="_NA_"/></field>
         <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountType}" position="1">
             <drop-down allow-empty="true">
-                <entity-options entity-name="GlAccountType" description="${description}">
+                <entity-options entity-name="GlAccountType">
                     <entity-order-by field-name="glAccountTypeId"/>
                 </entity-options>
             </drop-down>
@@ -603,7 +603,7 @@ under the License.
         </field>
         <field name="purposeEnumId" title="${uiLabelMap.CommonPurpose}" position="1">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="CONVERSION_PURPOSE"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -613,7 +613,7 @@ under the License.
         <field name="productId" position="1"><text size="20"/></field>
         <field name="reconcileStatusId" position="2" title="${uiLabelMap.FormFieldTitle_reconcileStatus}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="ACCTG_ENREC_STATUS"/>
                     <entity-order-by field-name="statusId"/>
                 </entity-options>
@@ -631,7 +631,7 @@ under the License.
         <field name="acctgTransEntrySeqId"><display/></field>
         <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="GlAccountType" description="${description}">
+                <entity-options entity-name="GlAccountType">
                     <entity-order-by field-name="glAccountTypeId"/>
                 </entity-options>
             </drop-down>
@@ -647,7 +647,7 @@ under the License.
         <!--
         <field name="acctgTransEntryTypeId" title="${uiLabelMap.AccountingTransactionEntryType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="AcctgTransEntryType" description="${description}">
+                <entity-options entity-name="AcctgTransEntryType">
                     <entity-order-by field-name="acctgTransEntryTypeId"/>
                 </entity-options>
             </drop-down>
@@ -664,7 +664,7 @@ under the License.
         </field>
         <field name="reconcileStatusId" title="${uiLabelMap.FormFieldTitle_reconcileStatus}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="ACCTG_ENREC_STATUS"/>
                     <entity-order-by field-name="statusId"/>
                 </entity-options>
@@ -694,14 +694,14 @@ under the License.
         <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
         <field name="acctgTransTypeId" title="${uiLabelMap.FormFieldTitle_acctgTransType}" position="1">
             <drop-down no-current-selected-key="_NA_">
-                <entity-options entity-name="AcctgTransType" description="${description}">
+                <entity-options entity-name="AcctgTransType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}" position="2">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" description="${description}" key-field-name="glFiscalTypeId">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -716,7 +716,7 @@ under the License.
         </field>
         <field name="groupStatusId" title="${uiLabelMap.FormFieldTitle_groupStatus}" position="2">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="ACCTG_ENREC_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -728,7 +728,7 @@ under the License.
         </field>
         <field name="roleTypeId" position="2">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -854,7 +854,7 @@ under the License.
         <field name="statusId" use-when="glReconciliationId == null"><hidden value="GLREC_CREATED"/></field>
         <field name="statusId" use-when="glReconciliationId != null" title="${uiLabelMap.CommonStatus}">
             <drop-down>
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="GLREC_STATUS"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/accounting/widget/GlSetupForms.xml b/applications/accounting/widget/GlSetupForms.xml
index 31c706fea06..dc44a86a35e 100644
--- a/applications/accounting/widget/GlSetupForms.xml
+++ b/applications/accounting/widget/GlSetupForms.xml
@@ -193,7 +193,7 @@ under the License.
             tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('taxFormId')!=null)return
             (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
             <drop-down>
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="TAX_FORMS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -202,7 +202,7 @@ under the License.
         <field name="cogsMethodId" use-when="partyAcctgPreference==null"
             tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('cogsMethodId')!=null)return (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
             <drop-down>
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="COGS_METHODS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -227,7 +227,7 @@ under the License.
             tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('oldInvoiceSequenceEnumId')!=null)return
             (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
             <drop-down>
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="INVOICE_SEQMD"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -249,7 +249,7 @@ under the License.
             tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('oldQuoteSequenceEnumId')!=null)return
             (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
             <drop-down>
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="QUOTE_SEQMD"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -263,7 +263,7 @@ under the License.
             tooltip="${groovy: import org.ofbiz.base.util.UtilProperties; if(aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('oldOrderSequenceEnumId')!=null)return
             (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
             <drop-down>
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="ORDER_SEQMD"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -362,7 +362,7 @@ under the License.
                 (partyAcctgPreference!=null&amp;&amp;partyAcctgPreference.get('refundPaymentMethodId')==null&amp;&amp;aggregatedPartyAcctgPreference!= null&amp;&amp;aggregatedPartyAcctgPreference.get('refundPaymentMethodId')!=null))return
                 (UtilProperties.getMessage('AccountingUiLabels', 'AccountingInheritedValue', locale))}">
             <drop-down>
-                <entity-options entity-name="PaymentMethod" description="${description}" key-field-name="paymentMethodId">
+                <entity-options entity-name="PaymentMethod" key-field-name="paymentMethodId">
                     <entity-constraint name="partyId" operator="equals" env-name="organizationPartyId"/>
                 </entity-options>
             </drop-down>
@@ -412,7 +412,7 @@ under the License.
         </field>
         <field name="purposeEnumId" title="${uiLabelMap.CommonPurpose}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="CONVERSION_PURPOSE"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -457,7 +457,7 @@ under the License.
         <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
         <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountType}">
             <drop-down>
-                <entity-options entity-name="GlAccountType" description="${description}">
+                <entity-options entity-name="GlAccountType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -507,7 +507,7 @@ under the License.
         <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
         <field name="invoiceItemTypeId">
             <drop-down allow-empty="false" >
-                <entity-options description="${description}" entity-name="InvoiceItemType">
+                <entity-options entity-name="InvoiceItemType">
                     <entity-constraint name="invoiceItemTypeId" operator="like" value="INV_%"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -561,7 +561,7 @@ under the License.
         <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
         <field name="invoiceItemTypeId" title="${uiLabelMap.AccountingInvoicePurchaseItemType}">
             <drop-down allow-empty="false" >
-                <entity-options description="${description}" entity-name="InvoiceItemType">
+                <entity-options entity-name="InvoiceItemType">
                     <entity-constraint name="invoiceItemTypeId" operator="like" value="PINV%"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -605,14 +605,14 @@ under the License.
         <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
         <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}">
             <drop-down>
-                <entity-options entity-name="PaymentType" description="${description}" key-field-name="paymentTypeId">
+                <entity-options entity-name="PaymentType" key-field-name="paymentTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountType}">
             <drop-down>
-                <entity-options entity-name="GlAccountType" description="${description}" key-field-name="glAccountTypeId">
+                <entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -663,7 +663,7 @@ under the License.
         <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
         <field name="paymentMethodTypeId">
             <drop-down>
-                <entity-options entity-name="PaymentMethodType" description="${description}" key-field-name="paymentMethodTypeId">
+                <entity-options entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -727,7 +727,7 @@ under the License.
         </field>
         <field name="periodTypeId">
             <drop-down>
-                <entity-options entity-name="PeriodType" description="${description}">
+                <entity-options entity-name="PeriodType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -791,7 +791,7 @@ under the License.
         <field name="organizationPartyId"><hidden/></field>
         <field name="glAccountTypeId" title="${uiLabelMap.ProductAccountType}">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="GlAccountType">
+                <entity-options entity-name="GlAccountType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -836,7 +836,7 @@ under the License.
         <field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
         <field name="finAccountTypeId" title="${uiLabelMap.FormFieldTitle_finAccountTypeId}">
             <drop-down allow-empty="false">
-                <list-options key-name="finAccountTypeId" list-name="finAccountTypes" description="${description}"/>
+                <list-options key-name="finAccountTypeId" list-name="finAccountTypes"/>
             </drop-down>
         </field>
         <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}">
@@ -876,7 +876,7 @@ under the License.
         <field name="organizationPartyId"><hidden/></field>
         <field name="glAccountTypeId" title="${uiLabelMap.ProductAccountType}">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="GlAccountType">
+                <entity-options entity-name="GlAccountType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -921,7 +921,7 @@ under the License.
         <field name="organizationPartyId"><hidden/></field>
         <field name="varianceReasonId" title="${uiLabelMap.FormFieldTitle_varianceReasonId}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="VarianceReason" description="${description}">
+                <entity-options entity-name="VarianceReason">
                     <entity-order-by field-name="varianceReasonId"/>
                 </entity-options>
             </drop-down>
@@ -1065,14 +1065,14 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId" title="${uiLabelMap.FormFieldTitle_roleTypeId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" key-field-name="roleTypeId" description="${description}">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountTypeId}">
             <drop-down>
-                <entity-options entity-name="GlAccountType" description="${description}" key-field-name="glAccountTypeId">
+                <entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1113,7 +1113,7 @@ under the License.
         <field name="glAccountCategoryId"><text-find/></field>
         <field name="glAccountCategoryTypeId" title="${uiLabelMap.FormFieldTitle_glAccountCategoryType}">
             <drop-down>
-                <entity-options entity-name="GlAccountCategoryType" key-field-name="glAccountCategoryTypeId" description="${description}"/>
+                <entity-options entity-name="GlAccountCategoryType" key-field-name="glAccountCategoryTypeId"/>
             </drop-down>
         </field>
         <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -1146,7 +1146,7 @@ under the License.
         <field name="glAccountCategoryId" use-when="glAccountCategoryId==null"><hidden/></field>
         <field name="glAccountCategoryTypeId" title="${uiLabelMap.FormFieldTitle_glAccountCategoryType}">
             <drop-down>
-                <entity-options entity-name="GlAccountCategoryType" key-field-name="glAccountCategoryTypeId" description="${description}"/>
+                <entity-options entity-name="GlAccountCategoryType" key-field-name="glAccountCategoryTypeId"/>
             </drop-down>
         </field>
         <field name="submit" use-when="glAccountCategory==null" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
@@ -1202,7 +1202,7 @@ under the License.
         <field name="fixedAssetTypeId">
             <drop-down allow-empty="false">
                 <option key="_NA_" description="${uiLabelMap.CommonAll}"/>
-                <entity-options entity-name="FixedAssetType" description="${description}">
+                <entity-options entity-name="FixedAssetType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/accounting/widget/GlobalGlAccountsForms.xml b/applications/accounting/widget/GlobalGlAccountsForms.xml
index 0eb32cf310d..d97bd064c78 100644
--- a/applications/accounting/widget/GlobalGlAccountsForms.xml
+++ b/applications/accounting/widget/GlobalGlAccountsForms.xml
@@ -112,28 +112,28 @@ under the License.
 
         <field name="glAccountTypeId">
             <drop-down allow-empty="false" no-current-selected-key="_NA_">
-                <entity-options entity-name="GlAccountType" description="${description}">
+                <entity-options entity-name="GlAccountType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="glAccountClassId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="GlAccountClass" description="${description}">
+                <entity-options entity-name="GlAccountClass">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="glResourceTypeId">
             <drop-down allow-empty="false" no-current-selected-key="_NA_">
-                <entity-options entity-name="GlResourceType" description="${description}">
+                <entity-options entity-name="GlResourceType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="glXbrlClassId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="GlXbrlClass" description="${description}">
+                <entity-options entity-name="GlXbrlClass">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -255,14 +255,14 @@ under the License.
         </actions>
         <field name="rateTypeId">
             <drop-down>
-                <entity-options entity-name="RateType" description="${description}">
+                <entity-options entity-name="RateType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="periodTypeId" position="2">
             <drop-down>
-                <entity-options entity-name="PeriodType" description="${description}">
+                <entity-options entity-name="PeriodType">
                     <entity-constraint name="periodTypeId" operator="like" value="RATE_%"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -281,7 +281,7 @@ under the License.
         <field name="workEffortId"><lookup target-form-name="LookupWorkEffort"><sub-hyperlink target="ww" description="${workEffortName}"/></lookup></field>
         <field name="emplPositionTypeId" position="2">
             <drop-down allow-empty="true">
-                <entity-options entity-name="EmplPositionType" description="${description}">
+                <entity-options entity-name="EmplPositionType">
                     <entity-constraint name="emplPositionTypeId" operator="not-equals" value="_NA_"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
diff --git a/applications/accounting/widget/InvoiceForms.xml b/applications/accounting/widget/InvoiceForms.xml
index 7df8e9af531..513d8618574 100644
--- a/applications/accounting/widget/InvoiceForms.xml
+++ b/applications/accounting/widget/InvoiceForms.xml
@@ -28,12 +28,12 @@ under the License.
         <field name="description"><text-find ignore-case="true"/></field>
         <field position="1" name="invoiceTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="InvoiceType"/>
+                <entity-options entity-name="InvoiceType"/>
             </drop-down>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="INVOICE_STATUS"/>
                 </entity-options>
             </drop-down>
@@ -217,7 +217,7 @@ under the License.
         <field name="acctgTransTypeId"><display-entity entity-name="AcctgTransType"/></field>
         <field name="glJournalId"><display-entity entity-name="GlJournal" description="${glJournalName}"/></field>
         <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountType}"><display-entity entity-name="GlAccountType"/></field>
-        <field name="glAccountClassId" title="${uiLabelMap.AccountingGlAccountClass}"><display-entity entity-name="GlAccountClass" description="${description}"/></field>
+        <field name="glAccountClassId" title="${uiLabelMap.AccountingGlAccountClass}"><display-entity entity-name="GlAccountClass"/></field>
         <field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${lastName} ${groupName}"/></field>
         <field name="reconcileStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="origCurrencyUomId"><ignored/></field>
@@ -240,7 +240,7 @@ under the License.
         <field name="currencyUomId"><hidden value="${defaultOrganizationPartyCurrencyUomId}"/></field>
         <field position="2" name="invoiceTypeId">
             <drop-down allow-empty="false" no-current-selected-key="SALES_INVOICE">
-                <entity-options description="${description}" entity-name="InvoiceType">
+                <entity-options entity-name="InvoiceType">
                     <entity-constraint name="parentTypeId" value="SALES_INVOICE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -264,7 +264,7 @@ under the License.
         <field name="currencyUomId"><hidden value="${defaultOrganizationPartyCurrencyUomId}"/></field>
         <field position="2" name="invoiceTypeId">
             <drop-down allow-empty="false" no-current-selected-key="PURCHASE_INVOICE">
-                <entity-options description="${description}" entity-name="InvoiceType">
+                <entity-options entity-name="InvoiceType">
                     <entity-constraint name="parentTypeId" value="PURCHASE_INVOICE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -289,10 +289,10 @@ under the License.
         <field name="invoiceId"><hidden/></field>
         <field position="1" name="invoiceDate"><date-time/></field>
         <field position="2" name="dueDate"><date-time/></field>
-        <field position="1" name="invoiceTypeId" use-when="invoice!=null"><display-entity entity-name="InvoiceType" description="${description}"/></field>
+        <field position="1" name="invoiceTypeId" use-when="invoice!=null"><display-entity entity-name="InvoiceType"/></field>
         <field position="1" name="invoiceTypeId" use-when="invoice==null">
             <drop-down allow-empty="false" no-current-selected-key="SALES_INVOICE">
-                <entity-options description="${description}" entity-name="InvoiceType">
+                <entity-options entity-name="InvoiceType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -306,22 +306,22 @@ under the License.
         <field position="2" name="partyIdTo" entry-name="partyId" parameter-name="partyId" use-when="invoiceType.getString(&quot;parentTypeId&quot;).equals(&quot;SALES_INVOICE&quot;)"><lookup target-form-name="LookupPartyName"/></field>
         <field position="1" name="roleTypeId" use-when="invoice!=null&amp;&amp;invoice.getString(&quot;invoiceTypeId&quot;).equals(&quot;SALES_INVOICE&quot;)">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType">
+                <entity-options entity-name="RoleType">
                     <entity-constraint name="parentTypeId" operator="equals" value="CUSTOMER"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
-                <entity-options description="${description}" entity-name="RoleType">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field position="1" name="roleTypeId" use-when="invoice!=null&amp;&amp;invoice.getString(&quot;invoiceTypeId&quot;).equals(&quot;PURCHASE_INVOICE&quot;)">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType">
+                <entity-options entity-name="RoleType">
                     <entity-constraint name="parentTypeId" operator="equals" value="VENDOR"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
-                <entity-options description="${description}" entity-name="RoleType">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -363,7 +363,7 @@ under the License.
        <field name="quantity"><text size="10"/></field>
        <field name="invoiceItemTypeId">
            <drop-down allow-empty="false">
-               <list-options list-name="invoiceItemTypes" key-name="invoiceItemTypeId" description="${description}"/>
+               <list-options list-name="invoiceItemTypes" key-name="invoiceItemTypeId"/>
            </drop-down>
        </field>
        <field name="productId"><lookup target-form-name="LookupProduct" size="20"/></field>
@@ -391,7 +391,7 @@ under the License.
         <field name="invoiceId"><hidden/></field>
         <field position="1" name="invoiceItemTypeId">
             <drop-down allow-empty="false">
-                <list-options list-name="invoiceItemTypes" key-name="invoiceItemTypeId" description="${description}"/>
+                <list-options list-name="invoiceItemTypes" key-name="invoiceItemTypeId"/>
             </drop-down>
         </field>
         <field position="1" name="description"><text size="80"/></field>
@@ -535,7 +535,7 @@ under the License.
         <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="RoleType">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -608,7 +608,7 @@ under the License.
             </display-entity>
         </field>
         <field name="hours"><display/></field>
-        <field name="rateTypeId"><display-entity entity-name="RateType" description="${description}"/></field>
+        <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" target-type="inter-app">
@@ -625,7 +625,7 @@ under the License.
         <field name="billingAccountId"><hidden/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="INVOICE_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -643,7 +643,7 @@ under the License.
         </actions>
         <field name="invoiceId"><hidden/></field>
         <field name="termTypeId">
-            <display-entity entity-name="TermType" description="${description}"/>
+            <display-entity entity-name="TermType"/>
         </field>
         <field name="dueDate"><display/></field>
         <field name="amount"><display type="currency" currency="${invoice.currencyUomId}"/></field>
diff --git a/applications/accounting/widget/PaymentForms.xml b/applications/accounting/widget/PaymentForms.xml
index 1cb711acbc0..9a0020d1532 100644
--- a/applications/accounting/widget/PaymentForms.xml
+++ b/applications/accounting/widget/PaymentForms.xml
@@ -28,14 +28,14 @@ under the License.
         <field name="comments"><text-find ignore-case="true"/></field>
         <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}" position="1">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="PaymentType">
+                <entity-options entity-name="PaymentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="PMNT_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -95,7 +95,7 @@ under the License.
         <field name="partyIdTo"><lookup target-form-name="LookupPartyName"/></field>
         <field name="statusId" entry-name="attributeMap.statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="PMNT_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -140,12 +140,12 @@ under the License.
         <field name="partyIdTo" position="2"><lookup target-form-name="LookupPartyName"/></field>
         <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}" position="1">
             <drop-down allow-empty="false">
-                <list-options list-name="paymentTypes" key-name="paymentTypeId" description="${description}"/>
+                <list-options list-name="paymentTypes" key-name="paymentTypeId"/>
             </drop-down>
         </field>
         <field name="paymentMethodId" title="${uiLabelMap.AccountingPaymentMethodId}" position="2">
             <drop-down allow-empty="false">
-                <entity-options entity-name="PaymentMethod" description="${description}">
+                <entity-options entity-name="PaymentMethod">
                     <entity-constraint name="partyId" operator="equals" env-name="defaultOrganizationPartyId"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -175,7 +175,7 @@ under the License.
         <field name="partyIdFrom" position="2"><lookup target-form-name="LookupPartyName"/></field>
         <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}" position="1">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="PaymentType">
+                <entity-options entity-name="PaymentType">
                     <entity-constraint name="parentTypeId" value="RECEIPT"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -183,7 +183,7 @@ under the License.
         </field>
         <field name="paymentMethodId" title="${uiLabelMap.AccountingPaymentMethodId}" position="2">
             <drop-down allow-empty="false">
-                <entity-options entity-name="PaymentMethod" description="${description}">
+                <entity-options entity-name="PaymentMethod">
                     <entity-constraint name="partyId" operator="equals" env-name="defaultOrganizationPartyId"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -216,7 +216,7 @@ under the License.
         <field name="paymentId"><hidden/></field>
         <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}" position="1">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="PaymentType">
+                <entity-options entity-name="PaymentType">
                     <entity-constraint name="parentTypeId" value="${groovy:isDisbursement==true?&quot;DISBURSEMENT&quot;:&quot;RECEIPT&quot;}"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -268,7 +268,7 @@ under the License.
         <field name="paymentApplicationId"><hidden/></field>
         <field name="paymentId"><hidden/></field>
         <field name="invoiceId">
-            <display-entity entity-name="Invoice" description="${description}">
+            <display-entity entity-name="Invoice">
                 <sub-hyperlink target="invoiceOverview" description="[${invoiceId}]">
                     <parameter param-name="invoiceId"/>
                 </sub-hyperlink>
@@ -527,7 +527,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="termTypeId">
-            <display-entity entity-name="TermType" description="${description}"/>
+            <display-entity entity-name="TermType"/>
         </field>
         <field name="dueDate"><display/></field>
         <field name="amount"><display/></field>
@@ -536,7 +536,7 @@ under the License.
     </form>
     <form name="FinAccountTransAssociatedWithPayment" type="single" default-map-name="finAccountTrans" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="finAccountTransId" position="1"><display/></field>
-        <field name="finAccountTransTypeId" title="${uiLabelMap.FormFieldTitle_finAccountTransType}" position="2"><display-entity entity-name="FinAccountTransType" description="${description}"/></field>
+        <field name="finAccountTransTypeId" title="${uiLabelMap.FormFieldTitle_finAccountTransType}" position="2"><display-entity entity-name="FinAccountTransType"/></field>
         <field name="amount" position="1"><display type="currency" currency="${payment.currencyUomId}"/></field>
         <field name="glReconciliationId" position="2">
             <hyperlink target="ViewGlReconciliationWithTransaction" description="${finAccountTrans.glReconciliationId}">
@@ -545,6 +545,6 @@ under the License.
             </hyperlink>
         </field>
         <field name="transactionDate" position="1"><display/></field>
-        <field name="statusId"  position="2" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field>
+        <field name="statusId"  position="2" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
     </form>
 </forms>
diff --git a/applications/accounting/widget/PaymentGatewayConfigForms.xml b/applications/accounting/widget/PaymentGatewayConfigForms.xml
index 49db31c1b60..8e530f0343a 100644
--- a/applications/accounting/widget/PaymentGatewayConfigForms.xml
+++ b/applications/accounting/widget/PaymentGatewayConfigForms.xml
@@ -25,7 +25,7 @@ under the License.
         <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigDescription}"><text-find ignore-case="true"/></field>
         <field name="paymentGatewayConfigTypeId" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="PaymentGatewayConfigType" description="${description}" key-field-name="paymentGatewayConfigTypeId">
+                <entity-options entity-name="PaymentGatewayConfigType" key-field-name="paymentGatewayConfigTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -53,7 +53,7 @@ under the License.
             <hyperlink description="${description}" target="EditPaymentGatewayConfig?paymentGatewayConfigId=${paymentGatewayConfigId}"/>
         </field>
         <field name="paymentGatewayConfigTypeId" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}">
-            <display-entity entity-name="PaymentGatewayConfigType" key-field-name="paymentGatewayConfigTypeId" description="${description}"/>
+            <display-entity entity-name="PaymentGatewayConfigType" key-field-name="paymentGatewayConfigTypeId"/>
         </field>
     </form>
     
@@ -61,7 +61,7 @@ under the License.
         <field name="paymentGatewayConfigId"><hidden/></field>
         <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigDescription}"><text size="60" maxlength="60"/></field>
         <field name="paymentGatewayConfigTypeId" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeId}">
-            <display-entity entity-name="PaymentGatewayConfigType" key-field-name="paymentGatewayConfigTypeId" description="${description}"/>
+            <display-entity entity-name="PaymentGatewayConfigType" key-field-name="paymentGatewayConfigTypeId"/>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
             <submit button-type="button"/>
@@ -439,7 +439,7 @@ under the License.
         <field name="description" title="${uiLabelMap.AccountingPaymentGatewayConfigTypeDescription}"><text size="60" maxlength="60"/></field>
         <field name="parentTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="PaymentGatewayConfigType" description="${description}" key-field-name="paymentGatewayConfigTypeId">
+                <entity-options entity-name="PaymentGatewayConfigType" key-field-name="paymentGatewayConfigTypeId">
                     <entity-constraint name="paymentGatewayConfigTypeId" operator="not-equals" env-name="paymentGatewayConfigTypeId"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
diff --git a/applications/accounting/widget/PaymentGroupForms.xml b/applications/accounting/widget/PaymentGroupForms.xml
index 62f48e73f19..f4cd6b285eb 100644
--- a/applications/accounting/widget/PaymentGroupForms.xml
+++ b/applications/accounting/widget/PaymentGroupForms.xml
@@ -84,11 +84,11 @@ under the License.
         <field use-when="paymentGroup==null @and paymentGroupId!=null" name="paymentGroupId"><display description="${uiLabelMap.CommonCannotBeFound}: [${paymentGroupId}]" also-hidden="false"/></field>
         <field name="paymentGroupId" use-when="display==true"><display/></field>
         <field name="paymentGroupTypeId" title="${uiLabelMap.CommonType}">
-            <display-entity entity-name="PaymentGroupType" description="${description}"/>
+            <display-entity entity-name="PaymentGroupType"/>
         </field>
         <field name="paymentGroupTypeId" use-when="paymentGroup==null" title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="PaymentGroupType" description="${description}">
+                <entity-options entity-name="PaymentGroupType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -138,12 +138,12 @@ under the License.
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="paymentTypeId" title="${uiLabelMap.OrderPaymentType}"><display-entity entity-name="PaymentType" description="${description}"/></field>
+        <field name="paymentTypeId" title="${uiLabelMap.OrderPaymentType}"><display-entity entity-name="PaymentType"/></field>
         <field name="paymentMethodTypeId" use-when="cardType!=null">
             <display-entity entity-name="PaymentMethodType" description="${description} (${cardType})"/>
         </field>
         <field name="paymentMethodTypeId" use-when="cardType==null">
-            <display-entity entity-name="PaymentMethodType" description="${description}"/>
+            <display-entity entity-name="PaymentMethodType"/>
         </field>
         <field name="amount"><display currency="${payment.currencyUomId}" type="currency"/></field>
         <field name="fromDate"><display/></field>
@@ -194,7 +194,7 @@ under the License.
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="paymentTypeId" title="${uiLabelMap.OrderPaymentType}"><display-entity entity-name="PaymentType" description="${description}"/></field>
+        <field name="paymentTypeId" title="${uiLabelMap.OrderPaymentType}"><display-entity entity-name="PaymentType"/></field>
         <field name="statusId" title="${uiLabelMap.AccountingPaymentStatus}"><display-entity entity-name="StatusItem"/></field>
         <field name="amount"><display also-hidden="false" type="currency" currency="${payment.currencyUomId}"/></field>
         <field name="fromDate"><display/></field>
diff --git a/applications/accounting/widget/ReportFinancialSummaryForms.xml b/applications/accounting/widget/ReportFinancialSummaryForms.xml
index a424e970f30..11042748ac6 100644
--- a/applications/accounting/widget/ReportFinancialSummaryForms.xml
+++ b/applications/accounting/widget/ReportFinancialSummaryForms.xml
@@ -82,14 +82,14 @@ under the License.
     <form name="TransactionSelectionForm" type="single" header-row-style="header-row" default-table-style="basic-table">
         <field name="selectedMonth" title="${uiLabelMap.CommonMonth}">
             <drop-down allow-empty="true">
-                <list-options list-name="monthList" key-name="value" description="${description}"/>
+                <list-options list-name="monthList" key-name="value"/>
             </drop-down>
         </field>
         <field name="fromDate" required-field="false"><date-time type="timestamp"/></field>
         <field name="thruDate" required-field="false"><date-time type="timestamp"/></field>
         <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" description="${description}">
+                <entity-options entity-name="GlFiscalType">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -138,14 +138,14 @@ under the License.
         <field name="period2ThruDate" title="${uiLabelMap.FormFieldTitle_period2ThruDate}" required-field="true" position="2"><date-time type="timestamp"/></field>
         <field name="period1GlFiscalTypeId" position="1">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="period2GlFiscalTypeId" position="2">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -159,7 +159,7 @@ under the License.
         <field name="period1ThruDate" title="${uiLabelMap.FormFieldTitle_period1ThruDate}" required-field="true"><date-time type="timestamp"/></field>
         <field name="period1GlFiscalTypeId">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -168,7 +168,7 @@ under the License.
         <field name="period2ThruDate" title="${uiLabelMap.FormFieldTitle_period2ThruDate}" required-field="true"><date-time type="timestamp"/></field>
         <field name="period2GlFiscalTypeId">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -218,7 +218,7 @@ under the License.
         <field name="thruDate"><date-time default-value="${nowTimestamp}"/></field>
         <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" description="${description}">
+                <entity-options entity-name="GlFiscalType">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -273,14 +273,14 @@ under the License.
         <field name="period2ThruDate" position="2"><date-time/></field>
         <field name="period1GlFiscalTypeId" position="1">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="period2GlFiscalTypeId" position="2">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -294,7 +294,7 @@ under the License.
         <field name="period1ThruDate"><date-time/></field>
         <field name="period1GlFiscalTypeId">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -302,7 +302,7 @@ under the License.
         <field name="period2ThruDate"><date-time/></field>
         <field name="period2GlFiscalTypeId">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -360,7 +360,7 @@ under the License.
         <field name="thruDate"><date-time/></field>
         <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" description="${description}">
+                <entity-options entity-name="GlFiscalType">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -375,7 +375,7 @@ under the License.
         <field name="thruDate"><date-time/></field>
         <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" description="${description}">
+                <entity-options entity-name="GlFiscalType">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -559,14 +559,14 @@ under the License.
     <form name="CashFlowStatementParameters" type="single" header-row-style="header-row" default-table-style="basic-table">
         <field name="selectedMonth" title="${uiLabelMap.CommonMonth}">
             <drop-down allow-empty="true">
-                <list-options list-name="monthList" key-name="value" description="${description}"/>
+                <list-options list-name="monthList" key-name="value"/>
             </drop-down>
         </field>
         <field name="fromDate" required-field="false"><date-time type="timestamp"/></field>
         <field name="thruDate" required-field="false"><date-time type="timestamp"/></field>
         <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" description="${description}">
+                <entity-options entity-name="GlFiscalType">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -625,7 +625,7 @@ under the License.
         <field name="thruDate"><date-time/></field>
         <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" description="${description}">
+                <entity-options entity-name="GlFiscalType">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -640,14 +640,14 @@ under the License.
         <field name="period2ThruDate" title="${uiLabelMap.FormFieldTitle_period2ThruDate}" required-field="true" position="2"><date-time type="timestamp"/></field>
         <field name="period1GlFiscalTypeId" position="1">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="period2GlFiscalTypeId" position="2">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -710,7 +710,7 @@ under the License.
         <field name="period1ThruDate" title="${uiLabelMap.FormFieldTitle_period1ThruDate}" required-field="true"><date-time type="timestamp"/></field>
         <field name="period1GlFiscalTypeId">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
@@ -719,7 +719,7 @@ under the License.
         <field name="period2ThruDate" title="${uiLabelMap.FormFieldTitle_period2ThruDate}" required-field="true"><date-time type="timestamp"/></field>
         <field name="period2GlFiscalTypeId">
             <drop-down>
-                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId" description="${description}">
+                <entity-options entity-name="GlFiscalType" key-field-name="glFiscalTypeId">
                     <entity-order-by field-name="glFiscalTypeId"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/accounting/widget/TaxAuthorityForms.xml b/applications/accounting/widget/TaxAuthorityForms.xml
index 79a3088e2a3..31dfbff148d 100644
--- a/applications/accounting/widget/TaxAuthorityForms.xml
+++ b/applications/accounting/widget/TaxAuthorityForms.xml
@@ -86,7 +86,7 @@ under the License.
         <field name="taxAuthPartyId"><hidden/></field>
         <field name="taxAuthGeoId"><hidden/></field>
         <field name="productCategoryId" title="${uiLabelMap.ProductCategory}">
-            <display-entity entity-name="ProductCategory" description="${description}">
+            <display-entity entity-name="ProductCategory">
                 <sub-hyperlink description="${productCategoryId}" target="/catalog/control/EditCategory" target-type="inter-app" link-style="buttontext">
                     <parameter param-name="productCategoryId"/>
                 </sub-hyperlink>
@@ -138,7 +138,7 @@ under the License.
 
         <field name="taxAuthorityAssocTypeId" title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="TaxAuthorityAssocType" description="${description}">
+                <entity-options entity-name="TaxAuthorityAssocType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -165,7 +165,7 @@ under the License.
 
         <field name="taxAuthorityAssocTypeId" title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="TaxAuthorityAssocType" description="${description}">
+                <entity-options entity-name="TaxAuthorityAssocType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -241,7 +241,7 @@ under the License.
 
         <field name="taxAuthorityRateTypeId" title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="TaxAuthorityRateType" description="${description}">
+                <entity-options entity-name="TaxAuthorityRateType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -283,7 +283,7 @@ under the License.
 
         <field name="taxAuthorityRateTypeId" title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="TaxAuthorityRateType" description="${description}">
+                <entity-options entity-name="TaxAuthorityRateType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/accounting/widget/TransactionForms.xml b/applications/accounting/widget/TransactionForms.xml
index d2a7e2c3f78..27777725d1f 100644
--- a/applications/accounting/widget/TransactionForms.xml
+++ b/applications/accounting/widget/TransactionForms.xml
@@ -27,7 +27,7 @@ under the License.
         </field>
         <field name="paymentServiceTypeEnumId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="PRDS_PAYSVC"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -38,14 +38,14 @@ under the License.
         </field>
         <field name="paymentMethodTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="PaymentMethodType" description="${description}" key-field-name="paymentMethodTypeId">
+                <entity-options entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="transCodeEnumId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="PGT_CODE"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -83,13 +83,13 @@ under the License.
             </hyperlink>
         </field>
         <field name="paymentServiceTypeEnumId">
-            <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
         <field name="paymentMethodTypeId">
-            <display-entity entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId" description="${description}"/>
+            <display-entity entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId"/>
         </field>
         <field name="transCodeEnumId">
-            <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
     </form>
     
@@ -139,13 +139,13 @@ under the License.
         <field name="submitButton" use-when="paymentGatewayResponse!=null&amp;&amp;paymentGatewayResponse.getString(&quot;gatewayFlag&quot;).equals(&quot;A&quot;)" title="${uiLabelMap.AccountingCapture}" widget-style="smallSubmit"><submit button-type="button"/></field>
         -->
         <field name="paymentServiceTypeEnumId">
-            <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
         <field name="paymentMethodTypeId">
-            <display-entity entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId" description="${description}"/>
+            <display-entity entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId"/>
         </field>
         <field name="transCodeEnumId">
-            <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
     </form>
     
@@ -156,7 +156,7 @@ under the License.
         <field name="orderPaymentPreferenceId"><text/></field>
         <field name="paymentMethodTypeId" title="${uiLabelMap.CommonPaymentMethodType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="PaymentMethodType" description="${description}"/>
+                <entity-options entity-name="PaymentMethodType"/>
             </drop-down>
         </field>
         <field name="overrideAmount" title="${uiLabelMap.AccountingAmount}"><text/></field>
@@ -170,12 +170,12 @@ under the License.
         <field name="orderPaymentPreferenceId"><text/></field>
         <field name="paymentMethodTypeId" title="${uiLabelMap.CommonPaymentMethodType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="PaymentMethodType" description="${description}"/>
+                <entity-options entity-name="PaymentMethodType"/>
             </drop-down>
         </field>
         <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="PaymentType" description="${description}" key-field-name="paymentTypeId">
+                <entity-options entity-name="PaymentType" key-field-name="paymentTypeId">
                     <entity-constraint name="parentTypeId" operator="equals" value="RECEIPT"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/accounting/widget/ap/forms/InvoiceForms.xml b/applications/accounting/widget/ap/forms/InvoiceForms.xml
index ad6153a75d5..7db1ccc5f17 100644
--- a/applications/accounting/widget/ap/forms/InvoiceForms.xml
+++ b/applications/accounting/widget/ap/forms/InvoiceForms.xml
@@ -69,7 +69,7 @@ under the License.
         <field name="parentTypeId"><hidden value="PURCHASE_INVOICE"/></field>
         <field position="1" name="invoiceTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="InvoiceType" description="${description}">
+                <entity-options entity-name="InvoiceType">
                     <entity-constraint name="parentTypeId" value="PURCHASE_INVOICE"/>
                 </entity-options>
             </drop-down>
@@ -83,7 +83,7 @@ under the License.
         <field name="partyIdFrom" title="${uiLabelMap.AccountingVendorParty}" position="1"><lookup target-form-name="LookupPartyName"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="INVOICE_STATUS"/>
                 </entity-options>
             </drop-down>
@@ -95,7 +95,7 @@ under the License.
         <field name="thruDueDate" position="2"><date-time/></field>
         <field name="invoiceTypeId" position="1">
             <drop-down allow-empty="false">
-                <entity-options entity-name="InvoiceType" description="${description}">
+                <entity-options entity-name="InvoiceType">
                     <entity-constraint name="parentTypeId" value="PURCHASE_INVOICE"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/accounting/widget/ap/forms/LookupForms.xml b/applications/accounting/widget/ap/forms/LookupForms.xml
index 909708185cc..1a8a970e287 100644
--- a/applications/accounting/widget/ap/forms/LookupForms.xml
+++ b/applications/accounting/widget/ap/forms/LookupForms.xml
@@ -26,14 +26,14 @@ under the License.
         <field position="1" name="invoiceId"><text-find/></field>
         <field position="1" name="invoiceTypeId">
             <drop-down allow-empty="true" no-current-selected-key="PURCHASE_INVOICE">
-                <entity-options description="${description}" entity-name="InvoiceType" key-field-name="invoiceTypeId">
+                <entity-options entity-name="InvoiceType" key-field-name="invoiceTypeId">
                     <entity-constraint name="parentTypeId" operator="equals" value="PURCHASE_INVOICE"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="INVOICE_STATUS"/>
                     <entity-constraint name="statusId" operator="not-equals" value="INVOICE_SENT"/>
                 </entity-options>
@@ -54,7 +54,7 @@ under the License.
         <field name="paymentId" title="${uiLabelMap.AccountingPaymentID}"><text-find/></field>
         <field name="paymentTypeId">
             <drop-down allow-empty="true" no-current-selected-key="VENDOR_PAYMENT">
-                <entity-options description="${description}" entity-name="PaymentType" key-field-name="paymentTypeId">
+                <entity-options entity-name="PaymentType" key-field-name="paymentTypeId">
                     <entity-constraint name="parentTypeId" operator="equals" value="DISBURSEMENT"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/accounting/widget/ap/forms/VendorForms.xml b/applications/accounting/widget/ap/forms/VendorForms.xml
index 324544518cf..13273d6d9b6 100644
--- a/applications/accounting/widget/ap/forms/VendorForms.xml
+++ b/applications/accounting/widget/ap/forms/VendorForms.xml
@@ -73,7 +73,7 @@ under the License.
         <field name="parentTypeId"><hidden value="DISBURSEMENT"/></field>
         <field name="paymentTypeId" position="1">
             <drop-down allow-empty="true">
-                <entity-options entity-name="PaymentType" description="${description}">
+                <entity-options entity-name="PaymentType">
                     <entity-constraint name="parentTypeId" value="DISBURSEMENT"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/accounting/widget/ar/forms/ArPaymentForms.xml b/applications/accounting/widget/ar/forms/ArPaymentForms.xml
index efcec4e3b64..ffbb9b52ada 100644
--- a/applications/accounting/widget/ar/forms/ArPaymentForms.xml
+++ b/applications/accounting/widget/ar/forms/ArPaymentForms.xml
@@ -28,7 +28,7 @@ under the License.
         </actions>
         <field name="paymentMethodTypeId" title="${uiLabelMap.FormFieldTitle_paymentMethodTypeId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="PaymentMethodType" description="${description}">
+                <entity-options entity-name="PaymentMethodType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -57,7 +57,7 @@ under the License.
         <field name="parentTypeId"><hidden value="RECEIPT"/></field>
         <field name="paymentTypeId" position="1">
             <drop-down allow-empty="true">
-                <entity-options entity-name="PaymentType" description="${description}">
+                <entity-options entity-name="PaymentType">
                     <entity-constraint name="parentTypeId" value="RECEIPT"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/accounting/widget/ar/forms/InvoiceForms.xml b/applications/accounting/widget/ar/forms/InvoiceForms.xml
index bef9a4a96ed..3b879d63df6 100644
--- a/applications/accounting/widget/ar/forms/InvoiceForms.xml
+++ b/applications/accounting/widget/ar/forms/InvoiceForms.xml
@@ -70,7 +70,7 @@ under the License.
         <field name="parentTypeId"><hidden value="SALES_INVOICE"/></field>
         <field name="invoiceTypeId" position="1">
             <drop-down allow-empty="true">
-                <entity-options entity-name="InvoiceType" description="${description}">
+                <entity-options entity-name="InvoiceType">
                     <entity-constraint name="parentTypeId" value="SALES_INVOICE"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/accounting/widget/ar/forms/LookupForms.xml b/applications/accounting/widget/ar/forms/LookupForms.xml
index b07d4376ad5..9ee4288bc79 100644
--- a/applications/accounting/widget/ar/forms/LookupForms.xml
+++ b/applications/accounting/widget/ar/forms/LookupForms.xml
@@ -26,14 +26,14 @@ under the License.
         <field position="1" name="invoiceId"><text-find/></field>
         <field position="1" name="invoiceTypeId">
             <drop-down allow-empty="true" no-current-selected-key="SALES_INVOICE">
-                <entity-options description="${description}" entity-name="InvoiceType" key-field-name="invoiceTypeId">
+                <entity-options entity-name="InvoiceType" key-field-name="invoiceTypeId">
                     <entity-constraint name="parentTypeId" operator="equals" value="SALES_INVOICE"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="INVOICE_STATUS"/>
                     <entity-constraint name="statusId" operator="not-equals" value="INVOICE_RECEIVED"/>
                 </entity-options>
@@ -54,7 +54,7 @@ under the License.
         <field name="paymentId" title="${uiLabelMap.AccountingPaymentID}"><text-find/></field>
         <field name="paymentTypeId">
             <drop-down allow-empty="true" no-current-selected-key="CUSTOMER_PAYMENT">
-                <entity-options description="${description}" entity-name="PaymentType" key-field-name="paymentTypeId">
+                <entity-options entity-name="PaymentType" key-field-name="paymentTypeId">
                     <entity-constraint name="parentTypeId" operator="equals" value="RECEIPT"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/commonext/widget/ofbizsetup/SetupForms.xml b/applications/commonext/widget/ofbizsetup/SetupForms.xml
index 08651254035..962b8e112fc 100644
--- a/applications/commonext/widget/ofbizsetup/SetupForms.xml
+++ b/applications/commonext/widget/ofbizsetup/SetupForms.xml
@@ -79,8 +79,8 @@
     <form name="ViewOrganization" type="single" default-map-name="lookupGroup">
         <field name="partyId" title="${uiLabelMap.SetupOrganizationPartyId}"><display/></field>
         <field name="groupName" title="${uiLabelMap.SetupOrganizationName}"><display/></field>
-        <field name="preferredCurrencyUomId" title="${uiLabelMap.CommonCurrency}"><display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="preferredCurrencyUomId" title="${uiLabelMap.CommonCurrency}"><display-entity entity-name="Uom" key-field-name="uomId"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
     </form>
     
     <form name="EditFacility" type="single" target="UpdateFacility" default-map-name="facility"
diff --git a/applications/content/widget/cms/CMSForms.xml b/applications/content/widget/cms/CMSForms.xml
index 7950b5cc067..f4000cfdf0b 100644
--- a/applications/content/widget/cms/CMSForms.xml
+++ b/applications/content/widget/cms/CMSForms.xml
@@ -108,22 +108,22 @@ under the License.
         <field name="textData" id-name="textData"><textarea rows="20" cols="60"/></field>
         <field name="statusId" >
             <drop-down allow-empty="false" no-current-selected-key="SUBSCRIBE_BRONZE">
-                <list-options list-name="statusList" key-name="statusId" description="${description}"/>
+                <list-options list-name="statusList" key-name="statusId"/>
             </drop-down>
         </field>
         <field name="privilegeEnumId" >
             <drop-down allow-empty="false" no-current-selected-key="SUBSCRIBE_BRONZE">
-                <list-options list-name="privilegeList" key-name="enumId" description="${description}"/>
+                <list-options list-name="privilegeList" key-name="enumId"/>
             </drop-down>
         </field>
         <field name="section" >
             <drop-down no-current-selected-key="${targetSection}" allow-empty="true">
-                <list-options list-name="sectionList" key-name="contentId" description="${description}"/>
+                <list-options list-name="sectionList" key-name="contentId"/>
             </drop-down>
         </field>
         <field name="topic" position="1">
             <drop-down  no-current-selected-key="${targetTopic}" allow-empty="true">
-                <list-options list-name="topicList" key-name="contentId" description="${description}"/>
+                <list-options list-name="topicList" key-name="contentId"/>
             </drop-down>
         </field>
         <!--
@@ -199,27 +199,24 @@ under the License.
         <auto-fields-service service-name="createContentPurposeOperation"/>
         <field name="contentPurposeTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}"
-                    entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId"/>
+                <entity-options entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId"/>
             </drop-down>
         </field>
         <field name="contentOperationId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}"
-                    entity-name="ContentOperation" key-field-name="contentOperationId"/>
+                <entity-options entity-name="ContentOperation" key-field-name="contentOperationId"/>
             </drop-down>
         </field>
         <field name="roleTypeId">
             <drop-down allow-empty="false">
                 <option key="_NA_" description="${uiLabelMap.CommonNA}"/>
-                <entity-options description="${description}"
-                    entity-name="RoleType" key-field-name="roleTypeId"/>
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId"/>
             </drop-down>
         </field>
         <field name="statusId">
             <drop-down allow-empty="false">
                 <option key="_NA_" description="${uiLabelMap.CommonNA}"/>
-                <entity-options description="${description}"
+                <entity-options
                     entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="PUBLISH_STATUS"/>
                 </entity-options>
@@ -228,8 +225,7 @@ under the License.
         <field name="privilegeEnumId">
             <drop-down allow-empty="false">
                 <option key="_NA_" description="${uiLabelMap.CommonNA}"/>
-                <entity-options description="${description}"
-                    entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="SUBSCRIPTION_TYPE"/>
                 </entity-options>
             </drop-down>
@@ -416,12 +412,12 @@ under the License.
         <field name="caContentAssocTypeId" position="1"
             use-when="&quot;${caContentAssocTypeId}&quot;.length()==0" >
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContentAssocType" key-field-name="contentAssocTypeId"/>
+                <entity-options entity-name="ContentAssocType" key-field-name="contentAssocTypeId"/>
             </drop-down>
         </field>
         <field name="caContentAssocPredicateId" position="1">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="MetaDataPredicate" key-field-name="metaDataPredicateId"/>
+                <entity-options entity-name="MetaDataPredicate" key-field-name="metaDataPredicateId"/>
             </drop-down>
         </field>
         <field name="caFromDate" title="${uiLabelMap.CommonFromDate}" widget-style="buttontext" position="1" use-when="&quot;${caFromDate}&quot;.length()>0">
@@ -454,7 +450,7 @@ under the License.
         </field>
         <field name="contentTypeId" position="1">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContentType" key-field-name="contentTypeId"/>
+                <entity-options entity-name="ContentType" key-field-name="contentTypeId"/>
             </drop-down>
         </field>
         <field name="ownerContentId" position="2">
@@ -475,7 +471,7 @@ under the License.
         </field>
         <field name="characterSetId" position="2">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="CharacterSet" key-field-name="characterSetId"/>
+                <entity-options entity-name="CharacterSet" key-field-name="characterSetId"/>
             </drop-down>
         </field>
         <field name="localeString" position="3">
@@ -483,7 +479,7 @@ under the License.
         </field>
         <field name="statusId" position="1">
             <drop-down allow-empty="true" >
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="PUBLISH_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -491,7 +487,7 @@ under the License.
         </field>
         <field name="privilegeEnumId" position="2">
             <drop-down allow-empty="false" no-current-selected-key="SUBSCRIBE_BRONZE">
-                <list-options list-name="privilegeList" key-name="enumId" description="${description}"/>
+                <list-options list-name="privilegeList" key-name="enumId"/>
             </drop-down>
         </field>
 
@@ -515,7 +511,7 @@ under the License.
         </field>
         <field name="drDataResourceTypeId" position="1">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
+                <entity-options entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
             </drop-down>
         </field>
         <field name="drObjectInfo" title="${uiLabelMap.ContentFilePath}" position="2">
@@ -523,7 +519,7 @@ under the License.
         </field>
         <field name="drDataTemplateTypeId" position="3">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
+                <entity-options entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
             </drop-down>
         </field>
         <field name="drMimeTypeId" position="1">
@@ -535,7 +531,7 @@ under the License.
         </field>
         <field name="drCharacterSetId" position="2">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="CharacterSet" key-field-name="characterSetId"/>
+                <entity-options entity-name="CharacterSet" key-field-name="characterSetId"/>
             </drop-down>
         </field>
         <field name="drLocaleString" position="3">
diff --git a/applications/content/widget/compdoc/CompDocForms.xml b/applications/content/widget/compdoc/CompDocForms.xml
index 7751c8000a9..76c1c8481aa 100644
--- a/applications/content/widget/compdoc/CompDocForms.xml
+++ b/applications/content/widget/compdoc/CompDocForms.xml
@@ -127,7 +127,7 @@ under the License.
         <field name="contentRevisionSeqId" widget-style="inputBox"><text/></field>
 <!--         <field name="contentRevisionSeqId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="" key-field-name="contentRevisionSeqId"/>
+                <entity-options entity-name="" key-field-name="contentRevisionSeqId"/>
             </drop-down>
         </field>
 -->
@@ -231,7 +231,7 @@ under the License.
         <field name="partyId" widget-style="inputBox"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <!-- <entity-constraint name="parentTypeId" value=""/> -->
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -258,7 +258,7 @@ under the License.
         <field name="partyId" map-name="empty" widget-style="inputBox"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <!-- <entity-constraint name="parentTypeId" value=""/> -->
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -280,7 +280,7 @@ under the License.
         <field name="partyId" widget-style="inputBox"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <!-- <entity-constraint name="parentTypeId" value=""/> -->
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -315,7 +315,7 @@ under the License.
         <field name="partyId" widget-style="inputBox"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -393,7 +393,7 @@ under the License.
             <display description="Survey Response"/>
         </field>
         <field name="mimeTypeId" title="${uiLabelMap.ContentDocumentType}" use-when="&quot;DOCUMENT&quot;.equals(contentTypeId) &amp;&amp; !&quot;SURVEY&quot;.equals(templateDataResourceTypeId)">
-            <display-entity entity-name="MimeType" description="${description}"/>
+            <display-entity entity-name="MimeType"/>
         </field>
         <field name="mimeTypeId" title="${uiLabelMap.ContentDocumentType}" use-when="&quot;TEMPLATE&quot;.equals(contentTypeId)" widget-style="smallSelect">
             <drop-down allow-empty="false">
@@ -443,7 +443,7 @@ under the License.
         </field>
         <field name="mimeTypeId" map-name="dataResource"
             use-when="&quot;DOCUMENT&quot;.equals(contentTypeId) &amp;&amp; mimeTypeId!=null &amp;&amp; !&quot;application/vnd.ofbiz.survey&quot;.equals(mimeTypeId)">
-            <display-entity entity-name="MimeType" key-field-name="mimeTypeId" description="${description}"/>
+            <display-entity entity-name="MimeType" key-field-name="mimeTypeId"/>
         </field>
         <field name="mimeTypeId" map-name="dataResource"
             use-when="&quot;DOCUMENT&quot;.equals(contentTypeId) &amp;&amp; mimeTypeId!=null &amp;&amp; &quot;application/vnd.ofbiz.survey&quot;.equals(mimeTypeId)">
@@ -507,7 +507,7 @@ under the License.
         <field name="sequenceNum" title="${uiLabelMap.CommonSequenceNum}"><display/></field>
 
        <field name="mimeTypeId" map-name="dataResource" title="${uiLabelMap.ContentDocumentType}" >
-            <display-entity entity-name="MimeType" key-field-name="mimeTypeId" description="${description}"/>
+            <display-entity entity-name="MimeType" key-field-name="mimeTypeId"/>
         </field>
         <field name="relatedDetailId" map-name="dataResource" title="${uiLabelMap.ContentSurvey}" use-when="dataResource!=null&amp;&amp;&quot;SURVEY&quot;.equals(dataResource.getString(&quot;dataResourceTypeId&quot;))">
             <display/>
diff --git a/applications/content/widget/content/ContentForms.xml b/applications/content/widget/content/ContentForms.xml
index 6fab9508022..83ce8275e87 100644
--- a/applications/content/widget/content/ContentForms.xml
+++ b/applications/content/widget/content/ContentForms.xml
@@ -30,14 +30,14 @@ under the License.
         <field name="description"><text-find ignore-case="true"/></field>
         <field name="contentTypeId" position="1">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContentType" key-field-name="contentTypeId">
+                <entity-options entity-name="ContentType" key-field-name="contentTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="mimeTypeId" position="2">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="MimeType" key-field-name="mimeTypeId">
+                <entity-options entity-name="MimeType" key-field-name="mimeTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -50,7 +50,7 @@ under the License.
         </field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="CONTENT_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -146,7 +146,7 @@ under the License.
         <field use-when="currentValue==null&amp;&amp;contentId!=null" name="contentId"><display description="${uiLabelMap.CommonCannotBeFound}: [${contentId}]" also-hidden="false"/></field>
         <field name="contentTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="ContentType" key-field-name="contentTypeId">
+                <entity-options entity-name="ContentType" key-field-name="contentTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -201,7 +201,7 @@ under the License.
         </field>
         <field name="characterSetId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="CharacterSet" key-field-name="characterSetId"/>
+                <entity-options entity-name="CharacterSet" key-field-name="characterSetId"/>
             </drop-down>
         </field>
         <field name="statusId" use-when="currentValue==null"><ignored/></field>
@@ -254,14 +254,14 @@ under the License.
         </field>
         <field name="contentAssocTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContentAssocType">
+                <entity-options entity-name="ContentAssocType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="metaDataPredicateId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="MetaDataPredicate"/>
+                <entity-options entity-name="MetaDataPredicate"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit">
@@ -288,7 +288,7 @@ under the License.
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType" description="${description}"></display-entity></field>
+        <field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType"></display-entity></field>
         <field name="mapKey"><display/></field>
         <field name="fromDate"><display description="${groovy:fromDate.toString().substring(0,10)}"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
@@ -319,7 +319,7 @@ under the License.
             </display-entity>
         </field>
         <field name="contentIdTo"><hidden/></field>
-        <field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType" description="${description}"></display-entity></field>
+        <field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType"></display-entity></field>
         <field name="mapKey"><display/></field>
         <field name="fromDate"><display description="${groovy:fromDate.toString().substring(0,10)}"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
@@ -346,7 +346,7 @@ under the License.
         <field name="partyId" widget-style="buttontext"><lookup target-form-name="LookupPerson"/></field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -390,7 +390,7 @@ under the License.
         <field name="contentId" title=" " widget-style="buttontext" ><lookup target-form-name="LookupContent"/></field>
         <field name="contentPurposeTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId">
+                <entity-options entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -450,7 +450,7 @@ under the License.
         </field>
         <field name="metaDataPredicateId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="MetaDataPredicate" key-field-name="metaDataPredicateId"/>
+                <entity-options entity-name="MetaDataPredicate" key-field-name="metaDataPredicateId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -464,7 +464,7 @@ under the License.
         </field>
         <field name="siteName" title="${uiLabelMap.CommonName}" sort-field="true"><display/></field>
         <field name="httpHost" sort-field="true"><display/></field>
-        <field name="webSiteContentTypeId"><display-entity entity-name="WebSiteContentType" description="${description}"/></field>
+        <field name="webSiteContentTypeId"><display-entity entity-name="WebSiteContentType"/></field>
         <field name="fromDate"><display type="date"/></field>
         <field name="thruDate"><display type="date"/></field>
     </form>
@@ -515,7 +515,7 @@ under the License.
         </field>
         <field name="workEffortContentTypeId">
             <drop-down no-current-selected-key="">
-                <entity-options entity-name="WorkEffortContentType" description="${description}" key-field-name="workEffortContentTypeId">
+                <entity-options entity-name="WorkEffortContentType" key-field-name="workEffortContentTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -538,7 +538,7 @@ under the License.
             </display-entity>
         </field>
         <field name="contentId"><hidden/></field>
-        <field name="workEffortContentTypeId"><display-entity entity-name="WorkEffortContentType" description="${description}"/></field>
+        <field name="workEffortContentTypeId"><display-entity entity-name="WorkEffortContentType"/></field>
         <field name="fromDate"><display/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
@@ -559,13 +559,13 @@ under the License.
             <hyperlink also-hidden="false" description="${contentName} [${contentId}]" target="showContent?contentId=${contentId}" target-window="_blank"/>
         </field>
         <field name="contentTypeId">
-            <display-entity entity-name="ContentType" key-field-name="contentTypeId" description="${description}"/>
+            <display-entity entity-name="ContentType" key-field-name="contentTypeId"/>
         </field>
         <field name="mimeTypeId">
-            <display-entity entity-name="MimeType" key-field-name="mimeTypeId" description="${description}"/>
+            <display-entity entity-name="MimeType" key-field-name="mimeTypeId"/>
         </field>
         <field name="statusId">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="caCreatedDate"><display/></field>
         <field name="delete" title="${uiLabelMap.CommonDelete}">
@@ -589,7 +589,7 @@ under the License.
         <field name="contentName"><text/></field>
         <field name="contentTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContentType">
+                <entity-options entity-name="ContentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -604,7 +604,7 @@ under the License.
         <field name="leftCoordinate"><text/></field>
         <field name="metaDataPredicateId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="MetaDataPredicate"/>
+                <entity-options entity-name="MetaDataPredicate"/>
             </drop-down>
         </field>
         <field name="submit" title="${uiLabelMap.CommonSubmit}"><submit/></field>
diff --git a/applications/content/widget/content/DataResourceForms.xml b/applications/content/widget/content/DataResourceForms.xml
index 06f29a0bed6..88923fb6c10 100644
--- a/applications/content/widget/content/DataResourceForms.xml
+++ b/applications/content/widget/content/DataResourceForms.xml
@@ -28,7 +28,7 @@ under the License.
         <field name="dataResourceName"><text-find ignore-case="true"/></field>
         <field name="dataResourceTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DataResourceType" key-field-name="dataResourceTypeId">
+                <entity-options entity-name="DataResourceType" key-field-name="dataResourceTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -42,7 +42,7 @@ under the License.
         </field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="CONTENT_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -88,9 +88,9 @@ under the License.
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="dataResourceTypeId" sort-field="true"><display-entity entity-name="DataResourceType" description="${description}"></display-entity></field>
-        <field name="mimeTypeId" sort-field="true"><display-entity entity-name="MimeType" description="${description}"></display-entity></field>
-        <field name="statusId" sort-field="true"><display-entity entity-name="StatusItem" description="${description}"></display-entity></field>
+        <field name="dataResourceTypeId" sort-field="true"><display-entity entity-name="DataResourceType"></display-entity></field>
+        <field name="mimeTypeId" sort-field="true"><display-entity entity-name="MimeType"></display-entity></field>
+        <field name="statusId" sort-field="true"><display-entity entity-name="StatusItem"></display-entity></field>
         <field name="localeString" sort-field="true"><display-entity entity-name="CountryCode" description="${countryName}[${countryCode}]" key-field-name="countryCode"></display-entity></field>
         <field name="createdByUserLogin" sort-field="true"><display-entity also-hidden="false" entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${firstName} ${lastName}"/></field>
         <field name="dataCategoryId" sort-field="true"><display-entity entity-name="DataCategory" description="${categoryName}[${dataCategoryId}]"></display-entity></field>
@@ -167,14 +167,14 @@ under the License.
         <field use-when="currentValue==null&amp;&amp;dataResourceId!=null" name="dataResourceId"><display description="${uiLabelMap.CommonCannotBeFound}: [${dataResourceId}]" also-hidden="false"/></field>
         <field name="dataResourceTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DataResourceType" key-field-name="dataResourceTypeId">
+                <entity-options entity-name="DataResourceType" key-field-name="dataResourceTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="dataTemplateTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DataTemplateType" key-field-name="dataTemplateTypeId">
+                <entity-options entity-name="DataTemplateType" key-field-name="dataTemplateTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -205,7 +205,7 @@ under the License.
         </field>
         <field name="characterSetId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="CharacterSet" key-field-name="characterSetId"/>
+                <entity-options entity-name="CharacterSet" key-field-name="characterSetId"/>
             </drop-down>
         </field>
 
@@ -241,17 +241,17 @@ under the License.
         <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"></field>
         <field name="dataResourceTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
+                <entity-options entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
             </drop-down>
         </field>
         <field name="dataTemplateTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
+                <entity-options entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
             </drop-down>
         </field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="CONTENT_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -274,7 +274,7 @@ under the License.
         </field>
         <field name="characterSetId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="CharacterSet" key-field-name="characterSetId"/>
+                <entity-options entity-name="CharacterSet" key-field-name="characterSetId"/>
             </drop-down>
         </field>
         <field name="createdDate"><display/></field>
@@ -390,7 +390,7 @@ under the License.
         <field name="partyId" title=" "><lookup target-form-name="LookupPerson"/></field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -449,14 +449,14 @@ under the License.
         <auto-fields-entity entity-name="ProductFeature" default-field-type="find"/>
         <field name="productFeatureTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ProductFeatureType">
+                <entity-options entity-name="ProductFeatureType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="productFeatureCategoryId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ProductFeatureCategory">
+                <entity-options entity-name="ProductFeatureCategory">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/content/widget/contentsetup/ContentSetupForms.xml b/applications/content/widget/contentsetup/ContentSetupForms.xml
index e682b4fdc20..d78a945e6d5 100644
--- a/applications/content/widget/contentsetup/ContentSetupForms.xml
+++ b/applications/content/widget/contentsetup/ContentSetupForms.xml
@@ -53,8 +53,7 @@ under the License.
         <auto-fields-service service-name="createContentTypeAttr"/>
         <field entity-name="ContentType" name="contentTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}"
-                    entity-name="ContentType" key-field-name="contentTypeId"/>
+                <entity-options entity-name="ContentType" key-field-name="contentTypeId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">
@@ -194,20 +193,18 @@ under the License.
         <auto-fields-service service-name="createContentPurposeOperation"/>
         <field name="contentPurposeTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}"
+                <entity-options
                     entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId"/>
             </drop-down>
         </field>
         <field name="contentOperationId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}"
-                    entity-name="ContentOperation" key-field-name="contentOperationId"/>
+                <entity-options entity-name="ContentOperation" key-field-name="contentOperationId"/>
             </drop-down>
         </field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}"
-                    entity-name="RoleType" key-field-name="roleTypeId"/>
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">
diff --git a/applications/content/widget/datasetup/DataSetupForms.xml b/applications/content/widget/datasetup/DataSetupForms.xml
index 83db2eff065..d61901baac4 100644
--- a/applications/content/widget/datasetup/DataSetupForms.xml
+++ b/applications/content/widget/datasetup/DataSetupForms.xml
@@ -53,8 +53,7 @@ under the License.
         <auto-fields-service service-name="createDataResourceTypeAttr"/>
         <field entity-name="DataResource" name="dataResourceTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}"
-                    entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
+                <entity-options entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">
@@ -153,7 +152,7 @@ under the License.
         <auto-fields-service service-name="createFileExtension"/>
         <field name="mimeTypeId" title=" ">
             <drop-down allow-empty="false">
-                <entity-options description="${description}"
+                <entity-options
                     entity-name="MimeType" key-field-name="mimeTypeId"/>
             </drop-down>
         </field>
@@ -172,8 +171,7 @@ under the License.
         </field>
         <field name="mimeTypeId" title=" ">
             <drop-down allow-empty="false">
-                <entity-options description="${description}"
-                    entity-name="MimeType" key-field-name="mimeTypeId"/>
+                <entity-options entity-name="MimeType" key-field-name="mimeTypeId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
@@ -246,7 +244,7 @@ under the License.
         <auto-fields-service service-name="createMimeTypeHtmlTemplate"/>
         <field name="mimeTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="MimeType" description="${description}" key-field-name="mimeTypeId"/>
+                <entity-options entity-name="MimeType" key-field-name="mimeTypeId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">
diff --git a/applications/content/widget/forum/ForumForms.xml b/applications/content/widget/forum/ForumForms.xml
index 6138b23f9c1..15fdbac441a 100644
--- a/applications/content/widget/forum/ForumForms.xml
+++ b/applications/content/widget/forum/ForumForms.xml
@@ -86,7 +86,7 @@ under the License.
         <auto-fields-entity entity-name="ContentPurpose" default-field-type="edit"/>
         <field name="forumGroupId"><hidden value="${parameters.forumGroupId}"/></field>
         <field name="contentId"><hidden value="${parameters.forumGroupId}"/></field>
-        <field name="contentPurposeTypeId"><display-entity entity-name="ContentPurposeType" description="${description}"/></field>
+        <field name="contentPurposeTypeId"><display-entity entity-name="ContentPurposeType"/></field>
         <field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="AddForumGroupPurpose" type="single" target="createForumGroupPurpose" title=""
@@ -96,7 +96,7 @@ under the License.
         <field name="contentId"><hidden value="${parameters.forumGroupId}"/></field>
         <field name="contentPurposeTypeId">
             <drop-down>
-                <entity-options entity-name="ContentPurposeType" description="${description}"></entity-options>
+                <entity-options entity-name="ContentPurposeType"></entity-options>
             </drop-down></field>
         <field name="addButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
@@ -107,7 +107,7 @@ under the License.
         <field name="forumGroupId"><hidden value="${parameters.forumGroupId}"/></field>
         <field name="contentId"><hidden value="${parameters.forumGroupId}"/></field>
         <field name="partyId"><display-entity entity-name="PartyNameView" description="${groupName}${firstName} ${lastName}"/></field>
-        <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
+        <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
         <field name="fromDate"><display/></field>
         <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="text-link"/></field>
         <field name="deleteButton" title="${uiLabelMap.CommonDelete}"><hyperlink target="deleteForumGroupRole">
@@ -129,7 +129,7 @@ under the License.
         </field>
         <field name="roleTypeId">
             <drop-down>
-                <entity-options entity-name="RoleType" description="${description}"></entity-options>
+                <entity-options entity-name="RoleType"></entity-options>
             </drop-down></field>
         <field name="addButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
diff --git a/applications/content/widget/layout/LayoutForms.xml b/applications/content/widget/layout/LayoutForms.xml
index f78bf80b46d..4c0abbbeeae 100644
--- a/applications/content/widget/layout/LayoutForms.xml
+++ b/applications/content/widget/layout/LayoutForms.xml
@@ -427,8 +427,7 @@ under the License.
         </field>
         <field name="drDataTemplateTypeId" >
             <drop-down no-current-selected-key="NONE">
-                <entity-options description="${description}"
-                    entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
+                <entity-options entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
             </drop-down>
         </field>
         <field name="drMimeTypeId">
diff --git a/applications/content/widget/survey/SurveyForms.xml b/applications/content/widget/survey/SurveyForms.xml
index 9f4d75ab827..79d27d13c29 100644
--- a/applications/content/widget/survey/SurveyForms.xml
+++ b/applications/content/widget/survey/SurveyForms.xml
@@ -178,7 +178,7 @@ under the License.
         <field name="surveyQuestionSeqId" title="${uiLabelMap.ContentSurveyQuestionNumber}"><display/></field>
         <field name="surveyQuestionTypeId">
             <drop-down allow-empty="false">
-               <entity-options entity-name="SurveyQuestionType" description="${description}"/>
+               <entity-options entity-name="SurveyQuestionType"/>
             </drop-down>
         </field>
 
@@ -196,12 +196,12 @@ under the License.
         <field name="surveyQuestionSeqId"><ignored/></field>
         <field name="surveyQuestionCategoryId">
             <drop-down allow-empty="false">
-               <entity-options entity-name="SurveyQuestionCategory" description="${description}"/>
+               <entity-options entity-name="SurveyQuestionCategory"/>
             </drop-down>
         </field>
         <field name="surveyQuestionTypeId">
             <drop-down allow-empty="false">
-               <entity-options entity-name="SurveyQuestionType" description="${description}"/>
+               <entity-options entity-name="SurveyQuestionType"/>
             </drop-down>
         </field>
 
diff --git a/applications/content/widget/website/WebAnalyticsForms.xml b/applications/content/widget/website/WebAnalyticsForms.xml
index 99d91884f11..651c82b0f07 100644
--- a/applications/content/widget/website/WebAnalyticsForms.xml
+++ b/applications/content/widget/website/WebAnalyticsForms.xml
@@ -61,7 +61,7 @@ under the License.
         </field>
         <field use-when="webAnalyticsConfig==null&amp;&amp;webAnalyticsTypeId==null" name="webAnalyticsTypeId" title="${uiLabelMap.CatalogWebAnalyticsType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="WebAnalyticsType" description="${description}">
+                <entity-options entity-name="WebAnalyticsType">
                     <entity-order-by field-name="webAnalyticsTypeId"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/content/widget/website/WebSiteForms.xml b/applications/content/widget/website/WebSiteForms.xml
index 45f0566cdf8..a7632e7e5da 100644
--- a/applications/content/widget/website/WebSiteForms.xml
+++ b/applications/content/widget/website/WebSiteForms.xml
@@ -50,7 +50,7 @@ under the License.
         </field>
         <field name="visualThemeSetId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="VisualThemeSet" description="${description}">
+                <entity-options entity-name="VisualThemeSet">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -183,7 +183,7 @@ under the License.
         <field name="contentId"><lookup target-form-name="LookupContent"/></field>
         <field name="webSiteContentTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="WebSiteContentType" description="${description}">
+                <entity-options entity-name="WebSiteContentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -199,7 +199,7 @@ under the License.
         <field name="webSiteId" map-name="webSite"><hidden/></field>
         <field name="roleTypeId">
             <drop-down no-current-selected-key="_NA_">
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -236,7 +236,7 @@ under the License.
         <field name="webSiteId"><hidden/></field>
         <field name="webSiteContentTypeId">
             <check all-checked="false">
-                <entity-options entity-name="WebSiteContentType" description="${description}">
+                <entity-options entity-name="WebSiteContentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </check>
diff --git a/applications/humanres/widget/forms/EmplLeaveForms.xml b/applications/humanres/widget/forms/EmplLeaveForms.xml
index 094af0a2f96..4e21dd77d84 100644
--- a/applications/humanres/widget/forms/EmplLeaveForms.xml
+++ b/applications/humanres/widget/forms/EmplLeaveForms.xml
@@ -26,17 +26,17 @@
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="leaveTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="leaveTypeId" entity-name="EmplLeaveType"/>
+                <entity-options key-field-name="leaveTypeId" entity-name="EmplLeaveType"/>
             </drop-down>
         </field>
         <field name="emplLeaveReasonTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="emplLeaveReasonTypeId" entity-name="EmplLeaveReasonType"/>
+                <entity-options key-field-name="emplLeaveReasonTypeId" entity-name="EmplLeaveReasonType"/>
             </drop-down>
         </field>
         <field name="leaveStatus">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="LEAVE_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -100,12 +100,12 @@
         <field name="approverPartyId" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="leaveTypeId" tooltip="${uiLabelMap.CommonRequired}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="leaveTypeId" entity-name="EmplLeaveType"/>
+                <entity-options key-field-name="leaveTypeId" entity-name="EmplLeaveType"/>
             </drop-down>
         </field>
         <field name="emplLeaveReasonTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="emplLeaveReasonTypeId" entity-name="EmplLeaveReasonType"/>
+                <entity-options key-field-name="emplLeaveReasonTypeId" entity-name="EmplLeaveReasonType"/>
             </drop-down>
         </field>
         <field name="fromDate" tooltip="${uiLabelMap.CommonRequired}"><date-time type="date"/></field>
@@ -121,7 +121,7 @@
         <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="leaveStatus">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="LEAVE_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -175,7 +175,7 @@
         <field name="description"><display/></field>
         <field name="leaveStatus" title="${uiLabelMap.HumanResLeaveStatus}">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="LEAVE_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
diff --git a/applications/humanres/widget/forms/EmplPositionForms.xml b/applications/humanres/widget/forms/EmplPositionForms.xml
index a554d930c2c..9ee4a78cfa3 100644
--- a/applications/humanres/widget/forms/EmplPositionForms.xml
+++ b/applications/humanres/widget/forms/EmplPositionForms.xml
@@ -44,8 +44,8 @@ under the License.
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
-        <field name="emplPositionTypeId"><display-entity entity-name="EmplPositionType" description="${description}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"/></field>
+        <field name="emplPositionTypeId"><display-entity entity-name="EmplPositionType"/></field>
     </form>
     <form name="ListEmplPositionsParty" extends="ListEmplPositions" list-name="ListEmplPositions">
         <actions>
@@ -80,7 +80,7 @@ under the License.
         </field>-->
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="EMPL_POSITION_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -90,7 +90,7 @@ under the License.
         <field name="budgetItemSeqId"><lookup target-form-name="LookupBudgetItem"/></field>
         <field name="emplPositionTypeId" title="${uiLabelMap.HumanResEmployeePositionTypeId}">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="emplPositionTypeId" entity-name="EmplPositionType">
+                <entity-options key-field-name="emplPositionTypeId" entity-name="EmplPositionType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -308,7 +308,7 @@ under the License.
                 <parameter param-name="partyId" from-field="emplPosition.partyId"/>
             </sub-hyperlink>
         </display-entity></field>
-        <field name="emplPositionTypeId"><display-entity entity-name="EmplPositionType" description="${description}">
+        <field name="emplPositionTypeId"><display-entity entity-name="EmplPositionType">
             <sub-hyperlink target="EditEmplPositionTypes" description="[${emplPosition.emplPositionTypeId}]">
                 <parameter param-name="emplPositionTypeId" from-field="emplPosition.emplPositionTypeId"/>
             </sub-hyperlink>
diff --git a/applications/humanres/widget/forms/EmployeeForms.xml b/applications/humanres/widget/forms/EmployeeForms.xml
index 873f5ad193a..32e40a1607c 100644
--- a/applications/humanres/widget/forms/EmployeeForms.xml
+++ b/applications/humanres/widget/forms/EmployeeForms.xml
@@ -70,7 +70,7 @@
         <field name="partyId"><hidden/></field>
         <field name="skillTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
             <drop-down>
-                <entity-options description="${description}" entity-name="SkillType">
+                <entity-options entity-name="SkillType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -90,7 +90,7 @@
         </actions>
         <auto-fields-service default-field-type="hidden" service-name="updatePartySkill"/>
         <field name="skillTypeId">
-            <display-entity entity-name="SkillType" description="${description}"/>
+            <display-entity entity-name="SkillType"/>
         </field>
         <field name="yearsExperience"><text/></field>
         <field name="rating"><text/></field>
@@ -108,14 +108,14 @@
         <field name="partyId"><hidden/></field>
         <field name="partyQualTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="partyQualTypeId" entity-name="PartyQualType">
+                <entity-options key-field-name="partyQualTypeId" entity-name="PartyQualType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="PARTY_INV_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -123,7 +123,7 @@
         </field>
         <field name="verifStatusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="PARTYQUAL_VERIFY"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -141,13 +141,13 @@
         </actions>
         <auto-fields-service service-name="updatePartyQual"/>
         <field name="partyId"><hidden/></field>
-        <field name="partyQualTypeId"><display-entity entity-name="PartyQualType" description="${description}"/></field>
+        <field name="partyQualTypeId"><display-entity entity-name="PartyQualType"/></field>
         <field name="fromDate"><display/></field>
         <field name="qualificationDesc"><text/></field>
         <field name="title"><text/></field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="PARTY_INV_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -155,7 +155,7 @@
         </field>
         <field name="verifStatusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="PARTYQUAL_VERIFY"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -175,7 +175,7 @@
         <field name="partyId"><hidden/></field>
         <field name="trainingClassTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="TrainingClassType">
+                <entity-options entity-name="TrainingClassType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -189,12 +189,12 @@
         <field name="partyId"><hidden/></field>
         <field name="leaveTypeId" tooltip="${uiLabelMap.CommonRequired}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="leaveTypeId" entity-name="EmplLeaveType"/>
+                <entity-options key-field-name="leaveTypeId" entity-name="EmplLeaveType"/>
             </drop-down>
         </field>
         <field name="emplLeaveReasonTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="emplLeaveReasonTypeId" entity-name="EmplLeaveReasonType"/>
+                <entity-options key-field-name="emplLeaveReasonTypeId" entity-name="EmplLeaveReasonType"/>
             </drop-down>
         </field>
         <field name="fromDate" tooltip="${uiLabelMap.CommonRequired}"><date-time type="timestamp"></date-time></field>
@@ -216,7 +216,7 @@
         <field name="approverPartyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="leaveStatus"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="emplLeaveReasonTypeId"><display/></field>
-        <field name="leaveTypeId"><display-entity description="${description}" entity-name="EmplLeaveType"/></field>
+        <field name="leaveTypeId"><display-entity entity-name="EmplLeaveType"/></field>
         <field name="fromDate"></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
     </form>
diff --git a/applications/humanres/widget/forms/EmploymentAppForms.xml b/applications/humanres/widget/forms/EmploymentAppForms.xml
index 839c01f7bcd..1472ca037a0 100644
--- a/applications/humanres/widget/forms/EmploymentAppForms.xml
+++ b/applications/humanres/widget/forms/EmploymentAppForms.xml
@@ -42,7 +42,7 @@ under the License.
         <field name="applicationId" title="${uiLabelMap.HumanResApplicationId}"><display also-hidden="true"/></field>
         <field name="statusId">
             <drop-down allow-empty="true" current-description="">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="EMPL_POSITION_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -80,7 +80,7 @@ under the License.
         <field name="applicationId"><lookup target-form-name="LookupEmploymentApp"/></field>
         <field name="statusId">
             <drop-down allow-empty="true" current-description="">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="EMPL_POSITION_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -88,7 +88,7 @@ under the License.
         </field>
         <field name="employmentAppSourceTypeId">
             <drop-down allow-empty="true" current-description="">
-                <entity-options description="${description}" key-field-name="employmentAppSourceTypeId" entity-name="EmploymentAppSourceType">
+                <entity-options key-field-name="employmentAppSourceTypeId" entity-name="EmploymentAppSourceType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -115,7 +115,7 @@ under the License.
         <field name="emplPositionId"><lookup target-form-name="LookupEmplPosition"/></field>
         <field name="statusId">
             <drop-down allow-empty="true" current-description="">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="EMPL_POSITION_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -126,7 +126,7 @@ under the License.
         <field name="referredByPartyId" use-when="employmentApp!=null"><hidden/></field>
         <field name="employmentAppSourceTypeId">
             <drop-down allow-empty="true" current-description="">
-                <entity-options description="${description}" key-field-name="employmentAppSourceTypeId" entity-name="EmploymentAppSourceType">
+                <entity-options key-field-name="employmentAppSourceTypeId" entity-name="EmploymentAppSourceType">
                     <entity-order-by field-name="employmentAppSourceTypeId"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/humanres/widget/forms/EmploymentForms.xml b/applications/humanres/widget/forms/EmploymentForms.xml
index f52dc77c8dd..0b86b79c756 100644
--- a/applications/humanres/widget/forms/EmploymentForms.xml
+++ b/applications/humanres/widget/forms/EmploymentForms.xml
@@ -39,7 +39,7 @@
         <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><lookup target-form-name="LookupTerminationReason"/></field>
         <field name="terminationTypeId">
             <drop-down allow-empty="true" current-description="">
-                <entity-options description="${description}" key-field-name="terminationTypeId" entity-name="TerminationType">
+                <entity-options key-field-name="terminationTypeId" entity-name="TerminationType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -130,14 +130,14 @@
         <field name="thruDate" use-when="employment!=null" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
         <field name="terminationReasonId" use-when="employment!=null" title="${uiLabelMap.HumanResTerminationReasonId}">
             <drop-down allow-empty="true" no-current-selected-key="------">
-                <entity-options description="${description}" key-field-name="terminationReasonId" entity-name="TerminationReason">
+                <entity-options key-field-name="terminationReasonId" entity-name="TerminationReason">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="terminationTypeId" use-when="employment!=null">
             <drop-down allow-empty="true" no-current-selected-key="------">
-                <entity-options description="${description}" key-field-name="terminationTypeId" entity-name="TerminationType">
+                <entity-options key-field-name="terminationTypeId" entity-name="TerminationType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -170,7 +170,7 @@
         <field name="payGradeId" title="${uiLabelMap.HumanResPayGradeID}"><lookup target-form-name="LookupPayGrade" size="20"/></field>
         <field name="periodTypeId" title="${uiLabelMap.FormFieldTitle_periodTypeId}">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="periodTypeId" entity-name="PeriodType">
+                <entity-options key-field-name="periodTypeId" entity-name="PeriodType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -196,11 +196,11 @@
         <field name="roleTypeIdTo"><hidden/></field>
         <field name="partyIdFrom"><hidden/></field>
         <field name="partyIdTo"><hidden/></field>
-        <field name="benefitTypeId"><display-entity entity-name="BenefitType" description="${description}"/></field>
+        <field name="benefitTypeId"><display-entity entity-name="BenefitType"/></field>
         <field name="fromDate"><display/></field>
         <field name="periodTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="periodTypeId" entity-name="PeriodType">
+                <entity-options key-field-name="periodTypeId" entity-name="PeriodType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -229,7 +229,7 @@
         <field name="fromDate"><hidden/></field>
         <field name="benefitTypeId" tooltip="${uiLabelMap.CommonRequired}">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="benefitTypeId" entity-name="BenefitType">
+                <entity-options key-field-name="benefitTypeId" entity-name="BenefitType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -237,7 +237,7 @@
         <field name="fromDate" tooltip="${uiLabelMap.CommonRequired}"/>
         <field name="periodTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="periodTypeId" entity-name="PeriodType">
+                <entity-options key-field-name="periodTypeId" entity-name="PeriodType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -257,10 +257,10 @@
         </actions>
         <auto-fields-service default-field-type="hidden" service-name="updatePayrollPreference"/>
         <field name="partyId"><display/></field>
-        <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
+        <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
         <field name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResPayrollPreferenceSeqId}"><display also-hidden="true"/></field>
-        <field name="paymentMethodTypeId"><display-entity entity-name="PaymentMethodType" description="${description}"/></field>
-        <field name="periodTypeId"><display-entity entity-name="PeriodType" description="${description}"/></field>
+        <field name="paymentMethodTypeId"><display-entity entity-name="PaymentMethodType"/></field>
+        <field name="periodTypeId"><display-entity entity-name="PeriodType"/></field>
         <field name="fromDate"><display/></field>
         <field name="thruDate"><date-time/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
@@ -282,21 +282,21 @@
         <field name="fromDate"><hidden/></field>
         <field name="deductionTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="deductionTypeId" entity-name="DeductionType">
+                <entity-options key-field-name="deductionTypeId" entity-name="DeductionType">
                     <entity-order-by field-name="deductionTypeId"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="paymentMethodTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="paymentMethodTypeId" entity-name="PaymentMethodType">
+                <entity-options key-field-name="paymentMethodTypeId" entity-name="PaymentMethodType">
                     <entity-order-by field-name="paymentMethodTypeId"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="periodTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="periodTypeId" entity-name="PeriodType">
+                <entity-options key-field-name="periodTypeId" entity-name="PeriodType">
                     <entity-order-by field-name="periodTypeId"/>
                 </entity-options>
             </drop-down>
@@ -323,7 +323,7 @@
         <field name="partyId"><hidden/></field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType">
+                <entity-options key-field-name="roleTypeId" entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -353,7 +353,7 @@
         <field name="description"><text size="12"/></field>
         <field name="statusId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="EMPL_POSITION_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -378,7 +378,7 @@
         <field name="unemploymentClaimId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupUnemploymentClaim"/></field>
         <field name="statusId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="EMPL_POSITION_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -428,14 +428,14 @@
         <field name="partyIdTo" title="${uiLabelMap.HumanResPartyIdTo}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeIdFrom" tooltip="${uiLabelMap.CommonRequired}">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType">
+                <entity-options key-field-name="roleTypeId" entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="roleTypeIdTo" tooltip="${uiLabelMap.CommonRequired}">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType">
+                <entity-options key-field-name="roleTypeId" entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/humanres/widget/forms/GlobalHRSettingForms.xml b/applications/humanres/widget/forms/GlobalHRSettingForms.xml
index e005cd4d316..c3e11e5a7b7 100644
--- a/applications/humanres/widget/forms/GlobalHRSettingForms.xml
+++ b/applications/humanres/widget/forms/GlobalHRSettingForms.xml
@@ -93,7 +93,7 @@ under the License.
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
         <field name="emplPositionTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="EmplPositionType" description="${description}" key-field-name="emplPositionTypeId"/>
+                <entity-options entity-name="EmplPositionType" key-field-name="emplPositionTypeId"/>
             </drop-down>
         </field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
@@ -155,9 +155,9 @@ under the License.
         <field name="emplPositionTypeId"><hidden/></field>
         <field name="fromDate"><hidden/></field>
         <field name="rateAmountFromDate"><hidden/></field>
-        <field name="rateTypeId"><display-entity entity-name="RateType" description="${description}"/></field>
-        <field name="periodTypeId"><display-entity entity-name="PeriodType" description="${description}"/></field>
-        <field name="payGradeId"><display-entity entity-name="PayGrade" description="${description}"/></field>
+        <field name="rateTypeId"><display-entity entity-name="RateType"/></field>
+        <field name="periodTypeId"><display-entity entity-name="PeriodType"/></field>
+        <field name="payGradeId"><display-entity entity-name="PayGrade"/></field>
         <field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}"><display/></field>
         <field name="rateAmount"><display type="currency" currency="${rateCurrencyUomId}"/></field>
         <field name="deleteButton" widget-style="buttontext"><submit/></field>
@@ -170,7 +170,7 @@ under the License.
         <field name="emplPositionTypeId"><hidden value="${parameters.emplPositionTypeId}"/></field>
         <field name="rateTypeId"   tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
             <drop-down>
-                <entity-options description="${description}" key-field-name="rateTypeId" entity-name="RateType">
+                <entity-options key-field-name="rateTypeId" entity-name="RateType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -178,7 +178,7 @@ under the License.
         <field name="payGradeId" position="2"><lookup target-form-name="LookupPayGrade"/></field>
         <field name="periodTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
             <drop-down allow-empty="false" no-current-selected-key="RATE_MONTH">
-                <entity-options description="${description}" key-field-name="periodTypeId" entity-name="PeriodType">
+                <entity-options key-field-name="periodTypeId" entity-name="PeriodType">
                     <entity-order-by field-name="periodTypeId"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/humanres/widget/forms/LookupForms.xml b/applications/humanres/widget/forms/LookupForms.xml
index f8147114d91..8a100c5bc8a 100644
--- a/applications/humanres/widget/forms/LookupForms.xml
+++ b/applications/humanres/widget/forms/LookupForms.xml
@@ -26,7 +26,7 @@ under the License.
         <field name="budgetId" title="${uiLabelMap.HumanResBudgetID}"><text-find/></field>
         <field name="budgetTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="budgetTypeId" entity-name="BudgetType"></entity-options>
+                <entity-options key-field-name="budgetTypeId" entity-name="BudgetType"></entity-options>
             </drop-down>
         </field>
         <!-- This lookup does not exist, is there for a long time? (I did not find its date of introduction, the older I found is r615322) and I can't see anything close -->
@@ -55,7 +55,7 @@ under the License.
         <field name="budgetItemSeqId" title="${uiLabelMap.HumanResBudgetItemSeqId}"><text-find/></field>
         <field name="budgetItemTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="budgetItemTypeId" entity-name="BudgetItemType"></entity-options>
+                <entity-options key-field-name="budgetItemTypeId" entity-name="BudgetItemType"></entity-options>
             </drop-down>
         </field>
         <field name="budgetId"><lookup  target-form-name="LookupBudget"/></field>
@@ -83,12 +83,12 @@ under the License.
         <field name="emplPositionId" title="${uiLabelMap.HumanResEmplPositionId}"><text-find/></field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem"></entity-options>
+                <entity-options key-field-name="statusId" entity-name="StatusItem"></entity-options>
             </drop-down>
         </field>
         <field name="emplPositionTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="emplPositionTypeId" entity-name="EmplPositionType"></entity-options>
+                <entity-options key-field-name="emplPositionTypeId" entity-name="EmplPositionType"></entity-options>
             </drop-down>
         </field>
         <field name="partyId"><lookup  target-form-name="LookupPartyName"/></field>
@@ -320,14 +320,14 @@ under the License.
         <field name="location"><text-find ignore-case="true"/></field>
         <field name="skillTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="SkillType">
+                <entity-options entity-name="SkillType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="jobPostingTypeEnumId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="JOB_POSTING"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
diff --git a/applications/humanres/widget/forms/PartyQualForms.xml b/applications/humanres/widget/forms/PartyQualForms.xml
index 9cab6044f1c..a9ca472ce5d 100644
--- a/applications/humanres/widget/forms/PartyQualForms.xml
+++ b/applications/humanres/widget/forms/PartyQualForms.xml
@@ -26,14 +26,14 @@ under the License.
         <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="partyQualTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="partyQualTypeId" entity-name="PartyQualType">
+                <entity-options key-field-name="partyQualTypeId" entity-name="PartyQualType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="HR_DEGREE_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -41,7 +41,7 @@ under the License.
         </field>
         <field name="verifStatusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="PARTYQUAL_VERIFY"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -70,13 +70,13 @@ under the License.
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="partyQualTypeId"><display-entity entity-name="PartyQualType" description="${description}"/></field>
+        <field name="partyQualTypeId"><display-entity entity-name="PartyQualType"/></field>
         <field name="fromDate"><display/></field>
         <field name="qualificationDesc"><text/></field>
         <field name="title"><text/></field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="HR_DEGREE_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -84,7 +84,7 @@ under the License.
         </field>
         <field name="verifStatusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="PARTYQUAL_VERIFY"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -109,14 +109,14 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="partyQual==null" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field>
         <field name="partyQualTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="partyQualTypeId" entity-name="PartyQualType">
+                <entity-options key-field-name="partyQualTypeId" entity-name="PartyQualType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="HR_DEGREE_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -124,7 +124,7 @@ under the License.
         </field>
         <field name="verifStatusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="PARTYQUAL_VERIFY"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
diff --git a/applications/humanres/widget/forms/PartySkillForms.xml b/applications/humanres/widget/forms/PartySkillForms.xml
index 2d8d1f966be..664b5cc8486 100644
--- a/applications/humanres/widget/forms/PartySkillForms.xml
+++ b/applications/humanres/widget/forms/PartySkillForms.xml
@@ -26,7 +26,7 @@ under the License.
         <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="skillTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="SkillType">
+                <entity-options entity-name="SkillType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -50,7 +50,7 @@ under the License.
         </actions>
         <auto-fields-service default-field-type="hidden" service-name="updatePartySkill"/>
         <field name="skillTypeId">
-            <display-entity entity-name="SkillType" description="${description}"/>
+            <display-entity entity-name="SkillType"/>
         </field>
         <field name="yearsExperience"><text/></field>
         <field name="rating"><text/></field>
@@ -73,7 +73,7 @@ under the License.
         <field name="partyId" use-when="partySkill == null" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field>
         <field name="skillTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
             <drop-down>
-                <entity-options description="${description}" entity-name="SkillType">
+                <entity-options entity-name="SkillType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/humanres/widget/forms/PerfReviewForms.xml b/applications/humanres/widget/forms/PerfReviewForms.xml
index 08f0223188a..25ec4076341 100644
--- a/applications/humanres/widget/forms/PerfReviewForms.xml
+++ b/applications/humanres/widget/forms/PerfReviewForms.xml
@@ -78,7 +78,7 @@ under the License.
         <field name="managerPartyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="managerRoleTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId"/>
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId"/>
             </drop-down>
         </field>
         <field name="paymentId" title="${uiLabelMap.FormFieldTitle_paymentId}"><lookup target-form-name="LookupPayment"/></field>
@@ -118,14 +118,14 @@ under the License.
         <field name="employeeRoleTypeId"><hidden/></field>
         <field name="perfReviewItemTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="perfReviewItemTypeId" entity-name="PerfReviewItemType">
+                <entity-options key-field-name="perfReviewItemTypeId" entity-name="PerfReviewItemType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="perfRatingTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="perfRatingTypeId" entity-name="PerfRatingType">
+                <entity-options key-field-name="perfRatingTypeId" entity-name="PerfRatingType">
                     <entity-order-by field-name="-perfRatingTypeId"/><!-- order from good to bad -->
                 </entity-options>
             </drop-down>
diff --git a/applications/humanres/widget/forms/PersonTrainingForms.xml b/applications/humanres/widget/forms/PersonTrainingForms.xml
index ee1d3707769..187437d867c 100644
--- a/applications/humanres/widget/forms/PersonTrainingForms.xml
+++ b/applications/humanres/widget/forms/PersonTrainingForms.xml
@@ -41,7 +41,7 @@ under the License.
         <field name="currentStatusId"><hidden value="CAL_TENTATIVE"/></field>
         <field name="workEffortName" title="${uiLabelMap.HumanResTrainings} ${uiLabelMap.CommonName}">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="trainingClassTypeId" entity-name="TrainingClassType">
+                <entity-options key-field-name="trainingClassTypeId" entity-name="TrainingClassType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -89,7 +89,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.FormFieldTitle_employeePartyId}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="trainingClassTypeId" title="${uiLabelMap.HumanResTrainingClassType}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="trainingClassTypeId" entity-name="TrainingClassType">
+                <entity-options key-field-name="trainingClassTypeId" entity-name="TrainingClassType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -142,7 +142,7 @@ under the License.
         <field name="trainingClassTypeId" title="${uiLabelMap.HumanResTrainingClassType}"/>
         <field name="approvalStatus">
             <drop-down allow-empty="false">
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="TRAINING_STATUS"/>
                         <entity-order-by field-name="description"/>
                 </entity-options>
@@ -158,7 +158,7 @@ under the License.
         <field name="partyId"><hidden value="${loginPartyId}"/></field>
         <field name="trainingClassTypeId" title="${uiLabelMap.HumanResTrainingClassType}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="trainingClassTypeId" entity-name="TrainingClassType">
+                <entity-options key-field-name="trainingClassTypeId" entity-name="TrainingClassType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>  
diff --git a/applications/humanres/widget/forms/RecruitmentForms.xml b/applications/humanres/widget/forms/RecruitmentForms.xml
index bbb5dab2da0..fcc0eb7b67b 100644
--- a/applications/humanres/widget/forms/RecruitmentForms.xml
+++ b/applications/humanres/widget/forms/RecruitmentForms.xml
@@ -28,14 +28,14 @@ under the License.
         <field name="jobRequisitionId"><lookup target-form-name="LookupJobRequisition"/></field>
         <field name="skillTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="SkillType">
+                <entity-options entity-name="SkillType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="jobPostingTypeEnumId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="JOB_POSTING"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -44,7 +44,7 @@ under the License.
         <field name="jobLocation"><text-find ignore-case="true"/></field>
         <field name="examTypeEnumId">
              <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="EXAM_TYPE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -77,7 +77,7 @@ under the License.
         </field>
         <field name="jobRequisitionId" use-when="!hasAdminPermission"><display/></field>
         <field name="skillTypeId">
-            <display-entity entity-name="SkillType" description="${description}"/>
+            <display-entity entity-name="SkillType"/>
         </field>
         <field name="jobPostingTypeEnumId"><display/></field>
         <field name="examTypeEnumId"><display/></field>
@@ -113,14 +113,14 @@ under the License.
         <field name="durationMonths"><text/></field>
         <field name="qualification" widget-style="required" tooltip="${uiLabelMap.CommonRequired}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="PartyQualType" key-field-name="partyQualTypeId" description="${description}">
+                <entity-options entity-name="PartyQualType" key-field-name="partyQualTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="examTypeEnumId">
              <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="EXAM_TYPE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -129,7 +129,7 @@ under the License.
         <field name="skillCriteria" title="${uiLabelMap.HumanResSkills} ${uiLabelMap.CommonRequired}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
         <field name="skillTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="SkillType">
+                <entity-options entity-name="SkillType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -147,7 +147,7 @@ under the License.
         <field name="applyingPartyId" use-when="!hasAdminPermission"><hidden value="${partyId}"/></field>
         <field name="statusId" title="${uiLabelMap.HumanResInternalJobPosting} ${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="IJP_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -246,7 +246,7 @@ under the License.
         </field>
         <field name="gradeSecuredEnumId">
              <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="INTR_RATNG"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -303,7 +303,7 @@ under the License.
         <field name="jobInterviewerPartyId" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="gradeSecuredEnumId">
              <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="INTR_RATNG"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -336,7 +336,7 @@ under the License.
         <field name="referredByPartyId"><hidden/></field>
         <field name="statusId" title="${uiLabelMap.HumanResInternalJobPosting} ${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="IJP_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -388,7 +388,7 @@ under the License.
         <field name="approverPartyId"><display/></field>
         <field name="statusId" title="${uiLabelMap.HumanResInternalJobPosting} ${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="IJP_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
diff --git a/applications/manufacturing/widget/manufacturing/BomForms.xml b/applications/manufacturing/widget/manufacturing/BomForms.xml
index 192c230e2bb..a166c32124d 100644
--- a/applications/manufacturing/widget/manufacturing/BomForms.xml
+++ b/applications/manufacturing/widget/manufacturing/BomForms.xml
@@ -28,7 +28,7 @@ under the License.
         </field>
         <field name="bomType" title="${uiLabelMap.ManufacturingBomType}">
             <drop-down allow-empty="false" no-current-selected-key="MANUF_COMPONENT">
-                <entity-options entity-name="ProductAssocType" key-field-name="productAssocTypeId" description="${description}">
+                <entity-options entity-name="ProductAssocType" key-field-name="productAssocTypeId">
                     <entity-constraint name="parentTypeId" value="PRODUCT_COMPONENT"/>
                 </entity-options>
             </drop-down>
@@ -149,7 +149,7 @@ under the License.
         </field>
         <field name="internalName" title="${uiLabelMap.ProductProductName}"><display/></field>
         <field name="productAssocTypeId" title="${uiLabelMap.ManufacturingBomType}">
-            <display-entity entity-name="ProductAssocType" key-field-name="productAssocTypeId" description="${description}"/>
+            <display-entity entity-name="ProductAssocType" key-field-name="productAssocTypeId"/>
         </field>
     </form>
 </forms>
diff --git a/applications/manufacturing/widget/manufacturing/CalendarForms.xml b/applications/manufacturing/widget/manufacturing/CalendarForms.xml
index 712ac65c3ef..af92e3b9ca8 100644
--- a/applications/manufacturing/widget/manufacturing/CalendarForms.xml
+++ b/applications/manufacturing/widget/manufacturing/CalendarForms.xml
@@ -130,7 +130,7 @@ under the License.
         <field name="description" title="${uiLabelMap.CommonDescription}" position="2" ></field>
         <field name="calendarWeekId" title="${uiLabelMap.ManufacturingCalendarWeekId}" position="3" >
             <drop-down>
-                <entity-options entity-name="TechDataCalendarWeek" description="${description}">
+                <entity-options entity-name="TechDataCalendarWeek">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -150,7 +150,7 @@ under the License.
         <field name="exceptionDateStart" title="${uiLabelMap.ManufacturingExceptionDateStart}" ><date-time type="date"/></field>
         <field name="calendarWeekId" title="${uiLabelMap.ManufacturingCalendarWeekId}">
             <drop-down>
-                <entity-options entity-name="TechDataCalendarWeek" description="${description}">
+                <entity-options entity-name="TechDataCalendarWeek">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/manufacturing/widget/manufacturing/CostForms.xml b/applications/manufacturing/widget/manufacturing/CostForms.xml
index e1b6c2e8e67..70289a9c718 100644
--- a/applications/manufacturing/widget/manufacturing/CostForms.xml
+++ b/applications/manufacturing/widget/manufacturing/CostForms.xml
@@ -59,7 +59,7 @@ under the License.
         </field>
         <field name="costCustomMethodId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="CustomMethod" key-field-name="customMethodId" description="${description}">
+                <entity-options entity-name="CustomMethod" key-field-name="customMethodId">
                     <entity-constraint name="customMethodTypeId" operator="equals" value="COST_FORMULA"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/manufacturing/widget/manufacturing/MrpForms.xml b/applications/manufacturing/widget/manufacturing/MrpForms.xml
index b1c7b87c15b..022c27e3c26 100644
--- a/applications/manufacturing/widget/manufacturing/MrpForms.xml
+++ b/applications/manufacturing/widget/manufacturing/MrpForms.xml
@@ -44,7 +44,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-entity entity-name="JobSandbox" default-field-type="display"/>
         <field name="statusId">
-            <display-entity entity-name="StatusItem" description="${description}"></display-entity>
+            <display-entity entity-name="StatusItem"></display-entity>
         </field>
         <field name="poolId"><hidden/></field>
         <field name="parentJobId"><hidden/></field>
@@ -63,7 +63,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-entity entity-name="JobSandbox" default-field-type="display"/>
         <field name="statusId">
-            <display-entity entity-name="StatusItem" description="${description}"></display-entity>
+            <display-entity entity-name="StatusItem"></display-entity>
         </field>
         <field name="poolId"><hidden/></field>
         <field name="parentJobId"><hidden/></field>
diff --git a/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml b/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
index 3c8961de900..59861fd08a9 100644
--- a/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
+++ b/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
@@ -27,14 +27,14 @@ under the License.
         <field name="partyId" required-field="true"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId" required-field="true">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="RoleType">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="workEffortId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="WorkEffort" key-field-name="workEffortId">
+                <entity-options entity-name="WorkEffort" key-field-name="workEffortId">
                     <entity-constraint name="workEffortParentId" operator="equals" value="${productionRunId}"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -71,7 +71,7 @@ under the License.
         <field name="workEffortId" title="${uiLabelMap.ManufacturingProductionRunId}"><text-find/></field>
         <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="PRODUCTION_RUN"/>
                 </entity-options>
              </drop-down>
@@ -123,7 +123,7 @@ under the License.
             <display-entity entity-name="Product" description="${internalName} [${productId}]"/>
         </field>
         <field name="currentStatusId">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="manufacturerId">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${firstName} ${lastName} [${partyId}]"/>
@@ -176,7 +176,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="lotId" map-name="inventoryItem"><display/></field>
-        <field name="statusId" map-name="inventoryItem"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="statusId" map-name="inventoryItem"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="unitCost" map-name="inventoryItem"><display/></field>
         <field name="quantity" entry-name="quantityOnHandDiff"><display/></field>
         <field name="datetimeReceived" map-name="inventoryItem"><display/></field>
@@ -274,7 +274,7 @@ under the License.
             <display-entity entity-name="Product" description="${internalName} [${productId}]"/>
         </field>
         <field name="currentStatusId">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="quantityToProduce" title="${uiLabelMap.ManufacturingQuantityToProduce}">
             <display/>
@@ -301,7 +301,7 @@ under the License.
         <field name="quantity" title="${uiLabelMap.ManufacturingProduceQuantity}"><text/></field>
         <field name="inventoryItemTypeId">
             <drop-down allow-empty="false" no-current-selected-key="NON_SERIAL_INV_ITEM">
-                <entity-options entity-name="InventoryItemType" description="${description}"/>
+                <entity-options entity-name="InventoryItemType"/>
             </drop-down>
         </field>
         <field name="lotId"><text default-value="${lastLotId}"/></field>
@@ -313,7 +313,7 @@ under the License.
         <field name="quantity" title="${uiLabelMap.ManufacturingProduceQuantity}" tooltip="${uiLabelMap.ManufacturingProduceQuantityMessage}"><text/></field>
         <field name="inventoryItemTypeId">
             <drop-down allow-empty="false" no-current-selected-key="NON_SERIAL_INV_ITEM">
-                <entity-options entity-name="InventoryItemType" description="${description}"/>
+                <entity-options entity-name="InventoryItemType"/>
             </drop-down>
         </field>
         <field name="lotId"><text default-value="${lastLotId}"/></field>
@@ -365,7 +365,7 @@ under the License.
         <field name="priority" title="${uiLabelMap.CommonSequenceNum}"><display/></field>
         <field name="workEffortId" title="${uiLabelMap.ManufacturingTaskName}"><display description="${workEffortName} [${workEffortId}]"/></field>
         <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="fixedAssetId"  title="${uiLabelMap.ManufacturingMachine}"><display/></field>
         <field name="reservPersons"><display/></field>
@@ -536,8 +536,8 @@ under the License.
         <field name="workEffortId"><hidden/></field>
         <field name="contentId"><display/></field>
         <field name="drDataResourceId"><display/></field>
-        <field name="workEffortContentTypeId"><display-entity entity-name="WorkEffortContentType" description="${description}"/></field>
-        <field name="contentTypeId"><display-entity entity-name="ContentType" description="${description}"/></field>
+        <field name="workEffortContentTypeId"><display-entity entity-name="WorkEffortContentType"/></field>
+        <field name="contentTypeId"><display-entity entity-name="ContentType"/></field>
         <field name="contentName"><display/></field>
         <field name="description"><display/></field>
         <field name="localeString"><display/></field>
@@ -569,7 +569,7 @@ under the License.
         <field name="workEffortId" entry-name="productionRunId"><hidden/></field>
         <field name="contentId"><display/></field>
         <field name="drDataResourceId"><display/></field>
-        <field name="contentTypeId"><display-entity entity-name="ContentType" description="${description}"/></field>
+        <field name="contentTypeId"><display-entity entity-name="ContentType"/></field>
         <field name="contentName"><display/></field>
         <field name="description"><display/></field>
         <field name="localeString"><display/></field>
@@ -586,7 +586,7 @@ under the License.
         <field name="drObjectInfo" title="${uiLabelMap.CommonContent}" entry-name="drDataResourceId" encode-output="true" use-when="${groovy: drDataResourceTypeId != null &amp;&amp; drDataResourceTypeId.equals(&quot;ELECTRONIC_TEXT&quot;)}">
             <display-entity entity-name="ElectronicText" key-field-name="dataResourceId" description="${textData}"></display-entity>
         </field>
-        <field name="workEffortContentTypeId"><drop-down><entity-options description="${description}" entity-name="WorkEffortContentType"></entity-options></drop-down></field>
+        <field name="workEffortContentTypeId"><drop-down><entity-options entity-name="WorkEffortContentType"></entity-options></drop-down></field>
         <field name="_rowSubmit" title="${uiLabelMap.CommonSelected}"><check/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit/></field>
     </form>
@@ -602,7 +602,7 @@ under the License.
         </field>
         <field name="availabilityStatusId" title="">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="WEFA_AVAILABILITY"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -670,7 +670,7 @@ under the License.
             <!-- Statuses are not yet defined for the WorkEffortFixedAssetAssign entity
                 so this field will be hidden meanwhile
             <drop-down>
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="WORK_EFF_ASSET_STTS"/>
                 </entity-options>
             </drop-down> -->
@@ -696,7 +696,7 @@ under the License.
         </field>
         <field name="availabilityStatusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="WEFA_AVAILABILITY"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -706,7 +706,7 @@ under the License.
             <!-- Statuses are not yet defined for the WorkEffortFixedAssetAssign entity
                 so this field will be hidden meanwhile
             <drop-down>
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="WORK_EFF_ASSET_STTS"/>
                 </entity-options>
             </drop-down> -->
@@ -758,7 +758,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="statusId">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="estimatedShipDate" sort-field="true"><display/></field>
         <field name="viewShipmentPlanLink" title=" " widget-style="buttontext">
@@ -786,7 +786,7 @@ under the License.
         </field>
         <field name="workFlowSequenceTypeId"  title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="WORKFLOW"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -984,7 +984,7 @@ under the License.
             <display-entity entity-name="InventoryItem" key-field-name="inventoryItemId" description="${unitCost}"/>
         </field>
         <field name="reasonEnumId">
-            <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
         <field name="description"><display/></field>
     </form>
@@ -1008,7 +1008,7 @@ under the License.
         <field name="lotId" title="${uiLabelMap.ProductLotId}"><text /></field>
         <field name="reasonEnumId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="IID_REASON"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
diff --git a/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml b/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
index f22dfd33216..a5804452a38 100644
--- a/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
+++ b/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml
@@ -123,7 +123,7 @@ under the License.
         <field name="workEffortName" title="${uiLabelMap.ManufacturingTaskName}"><text/></field>
         <field name="workEffortPurposeTypeId" title="${uiLabelMap.ManufacturingTaskPurpose}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="WorkEffortPurposeType">
+                <entity-options entity-name="WorkEffortPurposeType">
                     <entity-constraint name="workEffortPurposeTypeId" operator="like" value="ROU%"/>
                 </entity-options>
             </drop-down>
@@ -140,7 +140,7 @@ under the License.
         <field name="estimatedMilliSeconds" title="${uiLabelMap.ManufacturingTaskEstimatedMilliSeconds}"><text/></field>
         <field name="estimateCalcMethod">
             <drop-down allow-empty="true">
-                <entity-options entity-name="CustomMethod" key-field-name="customMethodId" description="${description}">
+                <entity-options entity-name="CustomMethod" key-field-name="customMethodId">
                     <entity-constraint name="customMethodTypeId" operator="equals" value="TASK_FORMULA"/>
                 </entity-options>
             </drop-down>
@@ -182,14 +182,14 @@ under the License.
         <field name="workEffortId"><hidden/></field>
         <field name="costComponentTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="CostComponentType" description="${description}">
+                <entity-options entity-name="CostComponentType">
                     <entity-constraint name="parentTypeId" operator="equals" env-name="nullField"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="costComponentCalcId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="CostComponentCalc" description="${description}">
+                <entity-options entity-name="CostComponentCalc">
                 </entity-options>
             </drop-down>
         </field>
@@ -381,7 +381,7 @@ under the License.
         <field name="workEffortId"><hidden /></field>
         <field name="fixedAssetTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="FixedAssetType" description="${description}"/>
+                <entity-options entity-name="FixedAssetType"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}">
diff --git a/applications/marketing/widget/ContactListForms.xml b/applications/marketing/widget/ContactListForms.xml
index e158346af3c..77923f2d69d 100644
--- a/applications/marketing/widget/ContactListForms.xml
+++ b/applications/marketing/widget/ContactListForms.xml
@@ -31,7 +31,7 @@ under the License.
         <field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><text/></field>
         <field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}">
             <drop-down>
-                <entity-options description="${description}" entity-name="ContactListType" key-field-name="contactListTypeId">
+                <entity-options entity-name="ContactListType" key-field-name="contactListTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -49,7 +49,7 @@ under the License.
 
         <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}">
             <drop-down no-current-selected-key="EMAIL_ADDRESS">
-                <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId">
+                <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -88,14 +88,14 @@ under the License.
         <field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><text-find/></field>
         <field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContactListType" key-field-name="contactListTypeId">
+                <entity-options entity-name="ContactListType" key-field-name="contactListTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId">
+                <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -155,7 +155,7 @@ under the License.
 
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down no-current-selected-key="CLPT_ACCEPTED">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="CONTACTLST_PARTY" operator="equals"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -182,7 +182,7 @@ under the License.
 
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="CONTACTLST_PARTY"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -252,7 +252,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="partyTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="PartyType" description="${description}">
+                <entity-options entity-name="PartyType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -260,7 +260,7 @@ under the License.
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
             <drop-down>
                 <option key="" description="${uiLabelMap.CommonAnyRoleType}"/>
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -336,7 +336,7 @@ under the License.
         <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="statusId" use-when="communicationEvent==null" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="false" no-current-selected-key="COM_PENDING">
-                 <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                 <entity-options entity-name="StatusItem" key-field-name="statusId">
                      <entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_STATUS"/>
                      <entity-order-by field-name="sequenceId"/>
                  </entity-options>
@@ -353,30 +353,30 @@ under the License.
 
         <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}" use-when="commEventContactMechType!=null&amp;&amp;parentCommEventContactMechType==null">
             <drop-down>
-                <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
+                <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
             </drop-down>
         </field>
         <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}" use-when="commEventContactMechType==null&amp;&amp;parentCommEventContactMechType!=null">
             <drop-down>
-                <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
+                <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
             </drop-down>
         </field>
         <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}" use-when="commEventContactMechType==null&amp;&amp;parentCommEventContactMechType==null">
             <drop-down>
-                <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
+                <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
             </drop-down>
         </field>
 
         <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}" use-when="commEventRoleTypeIdFrom!=null">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}" use-when="commEventRoleTypeIdTo!=null">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -441,7 +441,7 @@ under the License.
         <field name="commEventId" title="${uiLabelMap.MarketingContactListCommEventId}"><lookup target-form-name="LookupCommEvent"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_STATUS"/>
                 </entity-options>
             </drop-down>
@@ -473,10 +473,10 @@ under the License.
         <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}">
             <display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/>
         </field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field>
-        <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
-        <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
-        <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
+        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+        <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
+        <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
+        <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
         <field name="custReqestId" position="1"><display/></field>
         <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field>
         <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field>
@@ -489,14 +489,14 @@ under the License.
         <field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><text-find/></field>
         <field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContactListType" key-field-name="contactListTypeId">
+                <entity-options entity-name="ContactListType" key-field-name="contactListTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId">
+                <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -537,19 +537,19 @@ under the License.
         <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_STATUS"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
+                <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
             </drop-down>
         </field>
         <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId"/>
             </drop-down>
         </field>
         <field name="custRequestId"><lookup size="20" target-form-name="LookupCustRequest"/></field>
@@ -577,10 +577,10 @@ under the License.
         <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}">
             <display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/>
         </field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field>
-        <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
-        <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
-        <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
+        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+        <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
+        <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
+        <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
         <field name="custReqestId" position="1"><text size="20"/></field>
         <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field>
         <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field>
@@ -618,7 +618,7 @@ under the License.
         </field>
         <field name="contactMechId" title="${uiLabelMap.CommonEmailTo}"><display-entity entity-name="ContactMech" description="${infoString}"/></field>
         <field name="lastUpdatedStamp" title="${uiLabelMap.FormFieldTitle_lastModifiedDate}"><display/></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"/></field>
     </form>    
     <form name="CreateWebSiteContactList" type="single" target="createWebSiteContactList" 
             default-map-name="contactList" title="" header-row-style="header-row" default-table-style="basic-table">
diff --git a/applications/marketing/widget/DataSourceForms.xml b/applications/marketing/widget/DataSourceForms.xml
index dbe5c05fd3c..7eefa29636b 100644
--- a/applications/marketing/widget/DataSourceForms.xml
+++ b/applications/marketing/widget/DataSourceForms.xml
@@ -30,7 +30,7 @@ under the License.
 
         <field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}">
             <drop-down>
-                <entity-options description="${description}" entity-name="DataSourceType" key-field-name="dataSourceTypeId">
+                <entity-options entity-name="DataSourceType" key-field-name="dataSourceTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -112,7 +112,7 @@ under the License.
         <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field>
         <field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}">
             <drop-down>
-                <entity-options description="${description}" entity-name="DataSourceType" key-field-name="dataSourceTypeId">
+                <entity-options entity-name="DataSourceType" key-field-name="dataSourceTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/marketing/widget/MarketingCampaignForms.xml b/applications/marketing/widget/MarketingCampaignForms.xml
index 49afcf4fb0e..034f9434b2e 100644
--- a/applications/marketing/widget/MarketingCampaignForms.xml
+++ b/applications/marketing/widget/MarketingCampaignForms.xml
@@ -42,7 +42,7 @@ under the License.
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                      <entity-constraint name="statusTypeId" value="MKTG_CAMP_STATUS"/>
                      <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -75,7 +75,7 @@ under the License.
         </field>
         <field name="campaignName" title="${uiLabelMap.MarketingCampaignName}"><display/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" description="${description}" also-hidden="true"/>
+            <display-entity entity-name="StatusItem" also-hidden="true"/>
         </field>
         <field name="parentCampaignId" title="${uiLabelMap.MarketingParentCampaignId}"><display/></field>
     </form>
@@ -107,7 +107,7 @@ under the License.
         </field>
         -->
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}">
-            <display-entity entity-name="RoleType" description="${description}" also-hidden="true"/>
+            <display-entity entity-name="RoleType" also-hidden="true"/>
                 <!--<sub-hyperlink target="/partymgr/control/viewProfile" description="${partyId}" link-style="buttontext">
                     <parameter param-name="partyId"/>
                 </sub-hyperlink>
@@ -133,7 +133,7 @@ under the License.
         </field>
         <field name="roleTypeId">
             <drop-down>
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                 </entity-options>
             </drop-down>
         </field>
diff --git a/applications/marketing/widget/ReportForms.xml b/applications/marketing/widget/ReportForms.xml
index ecdeeae65a2..e8ca20fcd42 100644
--- a/applications/marketing/widget/ReportForms.xml
+++ b/applications/marketing/widget/ReportForms.xml
@@ -82,7 +82,7 @@ under the License.
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
                 <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_STATUS"/>
                 </entity-options>
             </drop-down>
@@ -90,7 +90,7 @@ under the License.
         <field name="roleStatusId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupRole} ${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
                 <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_ROL_STATUS"/>
                 </entity-options>
             </drop-down>
@@ -121,7 +121,7 @@ under the License.
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
                 <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="CONTACTLST_PARTY"/>
                 </entity-options>
             </drop-down>
@@ -161,11 +161,11 @@ under the License.
         <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}"><display/></field> 
         <field name="communicationEventTypeId" title="${uiLabelMap.MarketingContactListCommEventTypeId}"><display description="${communicationEventType.description}"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" description="${description}"/>
+            <display-entity entity-name="StatusItem"/>
         </field>
         <field name="partyIdTo" title="${uiLabelMap.FormFieldTitle_toPartyId}"><display/></field>
         <field name="roleStatusId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupRole} ${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="partyIdFrom" title="${uiLabelMap.FormFieldTitle_fromPartyId}"><display/></field>
         <field name="entryDate" title="${uiLabelMap.PartyEnteredDate}"><display/></field>
diff --git a/applications/marketing/widget/SegmentForms.xml b/applications/marketing/widget/SegmentForms.xml
index 2c2bd752fe7..a151c98c603 100644
--- a/applications/marketing/widget/SegmentForms.xml
+++ b/applications/marketing/widget/SegmentForms.xml
@@ -37,7 +37,7 @@ under the License.
                 <parameter param-name="segmentGroupId"/>
             </hyperlink>
         </field>
-        <field name="segmentGroupTypeId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupTypeId}"><display-entity entity-name="SegmentGroupType" description="${description}"/></field>
+        <field name="segmentGroupTypeId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupTypeId}"><display-entity entity-name="SegmentGroupType"/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
         <field name="productStoreId" title="${uiLabelMap.MarketingSegmentGroupProductStoreId}"><display/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
@@ -57,7 +57,7 @@ under the License.
 
         <field name="segmentGroupTypeId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupTypeId}">
             <drop-down>
-                <entity-options description="${description}" entity-name="SegmentGroupType" key-field-name="segmentGroupTypeId">
+                <entity-options entity-name="SegmentGroupType" key-field-name="segmentGroupTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -140,7 +140,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId">
             <drop-down>
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/marketing/widget/TrackingCodeForms.xml b/applications/marketing/widget/TrackingCodeForms.xml
index cf53f7ea3b3..be726a59b9e 100644
--- a/applications/marketing/widget/TrackingCodeForms.xml
+++ b/applications/marketing/widget/TrackingCodeForms.xml
@@ -32,7 +32,7 @@ under the License.
         <field name="comments" title="${uiLabelMap.MarketingTrackingCodeComments}"><textarea/></field>
         <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}">
             <drop-down>
-                <entity-options description="${description}" entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId">
+                <entity-options entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -102,7 +102,7 @@ under the License.
         <field name="orderId" title="${uiLabelMap.MarketingTrackingCodeOrderOrderId}"><display/></field>
         <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}">
             <drop-down>
-                <entity-options description="${description}" entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId">
+                <entity-options entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -123,7 +123,7 @@ under the License.
         <field name="orderId" title="${uiLabelMap.MarketingTrackingCodeOrderOrderId}"><lookup target-form-name="LookupOrderName"/></field>
         <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}">
             <drop-down>
-                <entity-options description="${description}" entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId">
+                <entity-options entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -145,7 +145,7 @@ under the License.
 
         <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}"><display/></field>
         <field name="orderId" title="${uiLabelMap.MarketingTrackingCodeOrderOrderId}"><display-entity entity-name="OrderHeader" description="${orderDate} [${orderId}]"/></field>
-        <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType" description="${description}"/></field>
+        <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType"/></field>
         <field name="isBillable" title="${uiLabelMap.MarketingTrackingCodeOrderIsBilliable}"><display/></field>
     </form>
 
@@ -158,7 +158,7 @@ under the License.
 
         <field name="sourceEnumId" title="${uiLabelMap.MarketingTrackingCodeVisitSourceEnumId}">
             <drop-down>
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value=" TRACKINGCODE_SRC"/>
                 </entity-options>
             </drop-down>
@@ -173,7 +173,7 @@ under the License.
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-find/></field>
         <field name="sourceEnumId" title="${uiLabelMap.MarketingTrackingCodeVisitSourceEnumId}">
             <drop-down>
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value=" TRACKINGCODE_SRC"/>
                 </entity-options>
             </drop-down>
@@ -209,7 +209,7 @@ under the License.
         <field name="description" title="${uiLabelMap.MarketingTrackingCodeDescription}"><text-find/></field>
         <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}">
             <drop-down>
-                <entity-options description="${description}" entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId">
+                <entity-options entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -276,8 +276,8 @@ under the License.
         <field name="visitorId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitorId}">
             <display-entity description="${partyId} ${userLoginId} [${visitorId}]" entity-name="Visitor" key-field-name="visitorId"/>
         </field>
-        <field name="contactMechTypeId" title="${uiLabelMap.MarketingTrackingCodeVisitContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
-        <field name="roleTypeId" title="${uiLabelMap.MarketingTrackingCodeVisitRoleTypeId}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
+        <field name="contactMechTypeId" title="${uiLabelMap.MarketingTrackingCodeVisitContactMechTypeId}"><display-entity entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
+        <field name="roleTypeId" title="${uiLabelMap.MarketingTrackingCodeVisitRoleTypeId}"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
         <field name="userLoginId" title="${uiLabelMap.MarketingTrackingCodeVisitUserLoginId}"><display/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
diff --git a/applications/marketing/widget/sfa/forms/AccountForms.xml b/applications/marketing/widget/sfa/forms/AccountForms.xml
index 18c198003c5..c9043078aa5 100644
--- a/applications/marketing/widget/sfa/forms/AccountForms.xml
+++ b/applications/marketing/widget/sfa/forms/AccountForms.xml
@@ -76,7 +76,7 @@ under the License.
         <field name="contactMechTypeId" event="onchange" action="javascript:ajaxUpdateAreas('contactMechContainer,ContactMechTypeOnly,contactMechTypeId=' + this.value);">
             <drop-down>
                 <option key="" description="${uiLabelMap.CommonNone}"/>
-                <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId" description="${description}"/>
+                <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
             </drop-down>
         </field>
         <field name="contactMechContainer" id-name="contactMechContainer" title=" "><container/></field>
diff --git a/applications/marketing/widget/sfa/forms/ContactForms.xml b/applications/marketing/widget/sfa/forms/ContactForms.xml
index febc33a9619..460402219e7 100644
--- a/applications/marketing/widget/sfa/forms/ContactForms.xml
+++ b/applications/marketing/widget/sfa/forms/ContactForms.xml
@@ -138,7 +138,7 @@ under the License.
         <field name="contactListTitle" title="${uiLabelMap.MarketingContactList}" title-area-style="group-label"><display/></field>
         <field name="contactListId" title="${uiLabelMap.MarketingContactList}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ContactList" description="${description}" key-field-name="contactListId"/>
+                <entity-options entity-name="ContactList" key-field-name="contactListId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
diff --git a/applications/marketing/widget/sfa/forms/LeadForms.xml b/applications/marketing/widget/sfa/forms/LeadForms.xml
index 136aeccc6f6..75de52aeb8c 100644
--- a/applications/marketing/widget/sfa/forms/LeadForms.xml
+++ b/applications/marketing/widget/sfa/forms/LeadForms.xml
@@ -69,7 +69,7 @@ under the License.
         <field name="contactListTitle" title="${uiLabelMap.MarketingContactList}" title-area-style="group-label"><display/></field>
         <field name="contactListId" title="${uiLabelMap.MarketingContactList}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ContactList" description="${description}" key-field-name="contactListId"/>
+                <entity-options entity-name="ContactList" key-field-name="contactListId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
diff --git a/applications/marketing/widget/sfa/forms/OpportunityForms.xml b/applications/marketing/widget/sfa/forms/OpportunityForms.xml
index dc7a952ece9..185511a3f0d 100644
--- a/applications/marketing/widget/sfa/forms/OpportunityForms.xml
+++ b/applications/marketing/widget/sfa/forms/OpportunityForms.xml
@@ -28,14 +28,14 @@ under the License.
         <field name="partyId" title="${uiLabelMap.SfaLead}"><lookup target-form-name="LookupLeads"/></field>
         <field name="opportunityStageId" title="${uiLabelMap.SfaInitialStage}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="SalesOpportunityStage">
+                <entity-options entity-name="SalesOpportunityStage">
                     <entity-order-by field-name="sequenceNum"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="typeEnumId" title="${uiLabelMap.SfaType}">
             <drop-down allow-empty="true">
-                <entity-options key-field-name="enumId" description="${description}" entity-name="Enumeration">
+                <entity-options key-field-name="enumId" entity-name="Enumeration">
                     <entity-constraint name="enumTypeId" operator="equals" value="SLSOPP_TYP_ENUM"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -73,7 +73,7 @@ under the License.
                 <parameter param-name="salesOpportunityId"/>
             </hyperlink>
         </field>
-        <field name="opportunityStageId" title="${uiLabelMap.SfaInitialStage}"><display-entity entity-name="SalesOpportunityStage" description="${description}"/></field>
+        <field name="opportunityStageId" title="${uiLabelMap.SfaInitialStage}"><display-entity entity-name="SalesOpportunityStage"/></field>
         <field name="partyId" title="${uiLabelMap.SfaLead}">
             <display-entity entity-name="PartyNameView" description="${firstName} ${lastName} ${middleName} ${groupName}" key-field-name="partyId">
                 <sub-hyperlink target="viewprofile" description=" [${partyId}]">
@@ -122,14 +122,14 @@ under the License.
         <field name="estimatedCloseDate" position="2" title="${uiLabelMap.SfaCloseDate}" widget-style="required"><date-time/></field>
         <field name="opportunityStageId" position="1" title="${uiLabelMap.SfaInitialStage}" widget-style="required">
             <drop-down>
-                <entity-options description="${description}" entity-name="SalesOpportunityStage">
+                <entity-options entity-name="SalesOpportunityStage">
                     <entity-order-by field-name="sequenceNum"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="typeEnumId" position="2" title="${uiLabelMap.SfaType}">
             <drop-down allow-empty="true">
-                <entity-options key-field-name="enumId" description="${description}" entity-name="Enumeration">
+                <entity-options key-field-name="enumId" entity-name="Enumeration">
                     <entity-constraint name="enumTypeId" operator="equals" value="SLSOPP_TYP_ENUM"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -137,7 +137,7 @@ under the License.
         </field>
         <field name="dataSourceId" use-when="communicationEvent==null" position="1" title="${uiLabelMap.SfaDataSourceLabel}">
             <drop-down allow-empty="true">
-                <entity-options key-field-name="dataSourceId" description="${description}" entity-name="DataSource">
+                <entity-options key-field-name="dataSourceId" entity-name="DataSource">
                     <entity-constraint name="dataSourceTypeId" operator="equals" value="LEAD_SOURCE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -145,7 +145,7 @@ under the License.
         </field>
         <field name="dataSourceId" use-when="communicationEvent!=null" position="1" title="${uiLabelMap.SfaDataSourceLabel}">
             <drop-down allow-empty="false" no-current-selected-key="EMAIL">
-                <entity-options key-field-name="dataSourceId" description="${description}" entity-name="DataSource">
+                <entity-options key-field-name="dataSourceId" entity-name="DataSource">
                     <entity-constraint name="dataSourceTypeId" operator="equals" value="LEAD_SOURCE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -170,7 +170,7 @@ under the License.
         <field name="nextStepDate" position="1" title="${uiLabelMap.SfaNextStepDate}"><display/></field>
         <field name="estimatedCloseDate" position="2" title="${uiLabelMap.SfaCloseDate}"><display/></field>
         <field name="opportunityStageId" position="1" title="${uiLabelMap.SfaInitialStage}">
-            <display-entity entity-name="SalesOpportunityStage" description="${description}"/>
+            <display-entity entity-name="SalesOpportunityStage"/>
         </field>
         <field name="typeEnumId" position="2" title="${uiLabelMap.SfaType}"><display/></field>
         <field name="marketingCampaignId" position="1" title="${uiLabelMap.MarketingCampaign}"><display/></field>
diff --git a/applications/order/widget/ordermgr/CustRequestForms.xml b/applications/order/widget/ordermgr/CustRequestForms.xml
index 66adce1e190..90a6eb6e703 100644
--- a/applications/order/widget/ordermgr/CustRequestForms.xml
+++ b/applications/order/widget/ordermgr/CustRequestForms.xml
@@ -25,12 +25,12 @@ under the License.
         <auto-fields-entity entity-name="CustRequest" default-field-type="find"/>
         <field name="custRequestTypeId" position="2">
             <drop-down allow-empty="true" allow-multiple="true">
-                <entity-options description="${description}" entity-name="CustRequestType" key-field-name="custRequestTypeId"/>
+                <entity-options entity-name="CustRequestType" key-field-name="custRequestTypeId"/>
             </drop-down>
         </field>
         <field name="statusId">
             <drop-down allow-empty="true" allow-multiple="true">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="CUSTREQ_STTS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -38,7 +38,7 @@ under the License.
         </field>
         <field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}" position="2">
             <drop-down allow-empty="true" allow-multiple="true">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="ORDER_SALES_CHANNEL"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -204,7 +204,7 @@ under the License.
         <auto-fields-entity entity-name="CustRequestStatus" default-field-type="display"/>
         <field name="custRequestId"><hidden/></field>
         <field name="custRequestStatusId"><hidden/></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"/></field>
     </form>
 
     <form name="ViewRequestRoles" type="list"
@@ -217,8 +217,8 @@ under the License.
         </actions>
         <auto-fields-entity entity-name="CustRequestParty" default-field-type="display"/>
         <field name="custRequestId"><hidden/></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
-        <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"/></field>
+        <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
         <field name="fromDate"><display type="date"/></field>
         <field name="thruDate"><display type="date"/></field>
     </form>
@@ -231,7 +231,7 @@ under the License.
                 <parameter param-name="workEffortId"/>
             </hyperlink>
         </field>
-        <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="startDate"><display type="date"/></field>
         <field name="completionDate"><display type="date"/></field>
     </form>
@@ -246,13 +246,13 @@ under the License.
         <field name="communicationEventId"><hidden value="${communicationEvent.communicationEventId}"/></field>
         <field name="custRequestTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="CustRequestType" description="${description}"/>
+                <entity-options entity-name="CustRequestType"/>
             </drop-down>
         </field>
         <field name="custRequestName" encode-output="false"><text default-value="${communicationEvent.subject}"/></field>
         <field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="ORDER_SALES_CHANNEL"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -260,7 +260,7 @@ under the License.
         </field>
         <field name="custRequestCategoryId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="CustRequestCategory" description="${description}"/>
+                <entity-options entity-name="CustRequestCategory"/>
             </drop-down>
         </field>
 
@@ -343,7 +343,7 @@ under the License.
         <field name="custRequestResolutionId"><hidden/></field>
         <field use-when="custRequestItem==null" name="statusId">
             <drop-down allow-empty="false" current="first-in-list">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="CUSTREQ_STTS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -394,12 +394,12 @@ under the License.
         </field>
         <field name="deliverableTypeId" title="${uiLabelMap.OrderOrderQuoteDeliverableTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DeliverableType" key-field-name="deliverableTypeId"/>
+                <entity-options entity-name="DeliverableType" key-field-name="deliverableTypeId"/>
             </drop-down>
         </field>
         <field name="skillTypeId" title="${uiLabelMap.OrderOrderQuoteSkillTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="SkillType" key-field-name="skillTypeId"/>
+                <entity-options entity-name="SkillType" key-field-name="skillTypeId"/>
             </drop-down>
         </field>
         <field name="uomId" title="${uiLabelMap.OrderOrderQuoteUomId}">
@@ -549,8 +549,8 @@ under the License.
             </service>
         </actions>
         <field name="custRequestId"><hidden/></field>
-        <field name="custRequestTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="CustRequestType" description="${description}"/></field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <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 target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultTo.fullName} [${custRequest.fromPartyId}]">
                 <parameter param-name="partyId" from-field="custRequest.fromPartyId"/>
@@ -584,14 +584,14 @@ under the License.
         </field>
         <field name="contentTypeId">
             <drop-down allow-empty="false" no-current-selected-key="DOCUMENT">
-                <entity-options description="${description}" entity-name="ContentType">
+                <entity-options entity-name="ContentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="statusId" use-when="contentId==void">
             <drop-down allow-empty="false" no-current-selected-key="CTNT_AVAILABLE">
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="CONTENT_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -607,7 +607,7 @@ under the License.
         </field>
         <!--field name="mimeTypeId" >
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="MimeType" key-field-name="mimeTypeId"/>
+                <entity-options entity-name="MimeType" key-field-name="mimeTypeId"/>
             </drop-down>
         </field-->
         <field name="dataResourceName" title="${uiLabelMap.CommonUpload}*"><file/></field>
@@ -675,7 +675,7 @@ under the License.
         <field name="fromPartyId">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} [${fromPartyId}])"/>
         </field>
-        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"/></field>
         <field name="priority" use-when="statusGroup!=&quot;OPEN&quot;"><display also-hidden="false"/></field>
         <field name="currentStatusId" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="estimatedStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPortalTaskPlanStartDate}"><display type="date"/></field>
@@ -698,7 +698,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="custRequestDate" title="${uiLabelMap.CommonDate}"><display type="date"/></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"/></field>
         <field name="priority" use-when="!statusId.equals(&quot;CRQ_COMPLETED&quot;)">
             <drop-down allow-empty="true">
                 <option key="1" description="${uiLabelMap.WorkEffortPriorityOne}"/>
@@ -740,7 +740,7 @@ under the License.
     <form name="EditCustRetStatusId" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml">
         <field name="statusId" entry-name="attributeMap.statusId">
             <drop-down>
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="ORDER_RETURN_STTS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
diff --git a/applications/order/widget/ordermgr/FieldLookupForms.xml b/applications/order/widget/ordermgr/FieldLookupForms.xml
index 9b2867bb789..04728601a68 100644
--- a/applications/order/widget/ordermgr/FieldLookupForms.xml
+++ b/applications/order/widget/ordermgr/FieldLookupForms.xml
@@ -27,14 +27,14 @@ under the License.
         <field name="orderHeaderId"><text-find/></field>
         <field name="orderTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="OrderType" key-field-name="orderTypeId">
+                <entity-options entity-name="OrderType" key-field-name="orderTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="salesChannelEnumId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="ORDER_SALES_CHANNEL"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -42,7 +42,7 @@ under the License.
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="ORDER_STATUS"/>
                 </entity-options>
             </drop-down>
@@ -83,13 +83,13 @@ under the License.
         <field name="orderId"><text-find/></field>
         <field name="orderTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="OrderType" description="${description}"/>
+                <entity-options entity-name="OrderType"/>
              </drop-down>
         </field>
         <field name="partyId"><text-find/></field>
         <field name="shipmentMethodTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ShipmentMethodType" description="${description}">
+                <entity-options entity-name="ShipmentMethodType">
                 </entity-options>
              </drop-down>
         </field>
@@ -156,7 +156,7 @@ under the License.
         <field name="partyId"><text-find/></field>
         <field name="shipmentMethodTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ShipmentMethodType" description="${description}">
+                <entity-options entity-name="ShipmentMethodType">
                 </entity-options>
              </drop-down>
         </field>
@@ -193,12 +193,12 @@ under the License.
         <auto-fields-entity entity-name="CustRequest" default-field-type="hidden"/>
         <field name="custRequestTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="CustRequestType" key-field-name="custRequestTypeId"/>
+                <entity-options entity-name="CustRequestType" key-field-name="custRequestTypeId"/>
             </drop-down>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="CUSTREQ_STTS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -215,7 +215,7 @@ under the License.
         <!--
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -260,7 +260,7 @@ under the License.
         <auto-fields-entity entity-name="CustRequestItem" default-field-type="find"/>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="CUSTREQ_STTS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -268,7 +268,7 @@ under the License.
         </field>
         <field name="custRequestResolutionId" >
             <drop-down allow-empty="true">
-                <entity-options entity-name="CustRequestResolution" description="${description}">
+                <entity-options entity-name="CustRequestResolution">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -305,14 +305,14 @@ under the License.
         <field name="quoteId" title="${uiLabelMap.OrderOrderQuoteId}"></field>
         <field name="quoteTypeId" title="${uiLabelMap.OrderOrderQuoteTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="QuoteType" key-field-name="quoteTypeId"/>
+                <entity-options entity-name="QuoteType" key-field-name="quoteTypeId"/>
             </drop-down>
         </field>
         <field name="partyId"><lookup  target-form-name="LookupPartyName"/></field>
         <field name="issueDate" title="${uiLabelMap.OrderOrderQuoteIssueDate}"></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="QUOTE_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -375,12 +375,12 @@ under the License.
         <field name="productFeatureId"><lookup  target-form-name="LookupProductFeature"/></field>
         <field name="deliverableTypeId" title="${uiLabelMap.OrderOrderQuoteDeliverableTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DeliverableType" key-field-name="deliverableTypeId"/>
+                <entity-options entity-name="DeliverableType" key-field-name="deliverableTypeId"/>
             </drop-down>
         </field>
         <field name="skillTypeId" title="${uiLabelMap.OrderOrderQuoteSkillTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="SkillType" key-field-name="skillTypeId"/>
+                <entity-options entity-name="SkillType" key-field-name="skillTypeId"/>
             </drop-down>
         </field>
         <field name="uomId" title="${uiLabelMap.OrderOrderQuoteUomId}">
@@ -454,12 +454,12 @@ under the License.
         <field name="requirementId"><text-find/></field>
         <field name="requirementTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RequirementType" description="${description}"/>
+                <entity-options entity-name="RequirementType"/>
             </drop-down>
         </field>
         <field name="statusId" title="${uiLabelMap.OrderRequirementStatusId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="REQUIREMENT_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -506,7 +506,7 @@ under the License.
         <field name="shoppingListId"><text-find/></field>
         <field name="shoppingListTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ShoppingListType" description="${description}"/>
+                <entity-options entity-name="ShoppingListType"/>
             </drop-down>
         </field>
 
diff --git a/applications/order/widget/ordermgr/OrderDeliveryScheduleForms.xml b/applications/order/widget/ordermgr/OrderDeliveryScheduleForms.xml
index e7103ac95bb..e2ddcf87bb9 100644
--- a/applications/order/widget/ordermgr/OrderDeliveryScheduleForms.xml
+++ b/applications/order/widget/ordermgr/OrderDeliveryScheduleForms.xml
@@ -28,21 +28,21 @@ under the License.
         <field name="orderItemSeqId"><hidden/></field>
         <field name="totalWeightUomId">
             <drop-down>
-                <entity-options key-field-name="uomId" entity-name="Uom" description="${description}">
+                <entity-options key-field-name="uomId" entity-name="Uom">
                     <entity-constraint name="uomTypeId" value="WEIGHT_MEASURE"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="totalCubicUomId">
             <drop-down>
-                <entity-options key-field-name="uomId" entity-name="Uom" description="${description}">
+                <entity-options key-field-name="uomId" entity-name="Uom">
                     <entity-constraint name="uomTypeId" value="VOLUME_DRY_MEASURE"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="statusId">
             <drop-down>
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="ORDER_DEL_SCH"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
diff --git a/applications/order/widget/ordermgr/OrderEntryForms.xml b/applications/order/widget/ordermgr/OrderEntryForms.xml
index 851bbbda236..0989dfca4c3 100644
--- a/applications/order/widget/ordermgr/OrderEntryForms.xml
+++ b/applications/order/widget/ordermgr/OrderEntryForms.xml
@@ -58,7 +58,7 @@ under the License.
         <field name="quoteId" title="${uiLabelMap.OrderOrderQuoteId}"></field>
         <field name="quoteTypeId" title="${uiLabelMap.OrderOrderQuoteTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="QuoteType" key-field-name="quoteTypeId"/>
+                <entity-options entity-name="QuoteType" key-field-name="quoteTypeId"/>
             </drop-down>
         </field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
diff --git a/applications/order/widget/ordermgr/OrderForms.xml b/applications/order/widget/ordermgr/OrderForms.xml
index 6b8d052b1b9..48202bc8c84 100644
--- a/applications/order/widget/ordermgr/OrderForms.xml
+++ b/applications/order/widget/ordermgr/OrderForms.xml
@@ -34,14 +34,14 @@ under the License.
         <field name="orderId" use-when="orderHeader==null" ><ignored/></field>
         <field name="orderTypeId">
             <drop-down>
-                <entity-options description="${description}" entity-name="OrderType" key-field-name="orderTypeId">
+                <entity-options entity-name="OrderType" key-field-name="orderTypeId">
                 </entity-options>
             </drop-down>
         </field>
 
         <field name="statusId" use-when="orderHeader==null" title="${uiLabelMap.CommonStatus}">
             <drop-down>
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="ORDER_STATUS"/>
                 </entity-options>
             </drop-down>
@@ -57,7 +57,7 @@ under the License.
 
         <field name="salesChannelEnumId">
             <drop-down>
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="ORDER_SALES_CHANNEL"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -126,7 +126,7 @@ under the License.
         <field name="orderId"><hidden value="${parameters.orderId}"/></field>
         <field name="termTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="TermType" description="${description}">
+                <entity-options entity-name="TermType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -237,7 +237,7 @@ under the License.
             </entity-and>
         </actions>
         <field name="orderTypeId" title="${uiLabelMap.FormFieldTitle_orderTypeId}">
-            <display-entity entity-name="OrderType" description="${description}"/>
+            <display-entity entity-name="OrderType"/>
         </field>
         <field name="orderId" title="${uiLabelMap.OrderOrderId}">
             <hyperlink target="orderview" description="${orderId}">
@@ -247,13 +247,13 @@ under the License.
         <field name="orderName" title="${uiLabelMap.OrderOrderName}"><display/></field>
         <field name="remainingSubTotal" title="${uiLabelMap.FormFieldTitle_remainingSubTotal}"><display/></field>
         <field name="grandTotal" title="${uiLabelMap.OrderGrandTotal}"><display/></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="orderDate" title="${uiLabelMap.OrderOrderDate}"><display/></field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
             <display-entity entity-name="PartyNameView" description="${groupName}"/>
         </field>
         <field name="roleTypeId" title="${uiLabelMap.FormFieldTitle_roleTypeId}">
-            <display-entity entity-name="RoleType" description="${description}"/>
+            <display-entity entity-name="RoleType"/>
         </field>
     </form>
 
diff --git a/applications/order/widget/ordermgr/OrderShopListForms.xml b/applications/order/widget/ordermgr/OrderShopListForms.xml
index acd2e87321e..6a69c01242b 100644
--- a/applications/order/widget/ordermgr/OrderShopListForms.xml
+++ b/applications/order/widget/ordermgr/OrderShopListForms.xml
@@ -25,7 +25,7 @@ under the License.
         <auto-fields-entity entity-name="ShoppingList"/>
         <field name="shoppingListTypeId">
             <drop-down>
-                <entity-options entity-name="ShoppingListType" description="${description}">
+                <entity-options entity-name="ShoppingListType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/order/widget/ordermgr/PartySettingsForm.xml b/applications/order/widget/ordermgr/PartySettingsForm.xml
index 96d528f920b..f89c532a4db 100644
--- a/applications/order/widget/ordermgr/PartySettingsForm.xml
+++ b/applications/order/widget/ordermgr/PartySettingsForm.xml
@@ -27,9 +27,7 @@ under the License.
         </field>
         <field name="optionalRoleTypeId" title="${uiLabelMap.FormFieldTitle_roleTypeId}">
             <drop-down allow-empty="false">
-                <entity-options description="${description}"
-                    entity-name="RoleType"
-                    key-field-name="roleTypeId"/>
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">
diff --git a/applications/order/widget/ordermgr/QuoteForms.xml b/applications/order/widget/ordermgr/QuoteForms.xml
index f88146d104d..3a19d9ab300 100644
--- a/applications/order/widget/ordermgr/QuoteForms.xml
+++ b/applications/order/widget/ordermgr/QuoteForms.xml
@@ -26,12 +26,12 @@ under the License.
         <field name="quoteId" title="${uiLabelMap.OrderOrderQuoteId}"></field>
         <field name="quoteTypeId" title="${uiLabelMap.OrderOrderQuoteTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="QuoteType" key-field-name="quoteTypeId"/>
+                <entity-options entity-name="QuoteType" key-field-name="quoteTypeId"/>
             </drop-down>
         </field>
         <field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="ORDER_SALES_CHANNEL"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -43,7 +43,7 @@ under the License.
         <field name="issueDate" title="${uiLabelMap.OrderOrderQuoteIssueDate}"></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="QUOTE_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -112,14 +112,14 @@ under the License.
         <field name="quoteId" title="${uiLabelMap.OrderOrderQuoteId}"><display/></field>
         <field name="quoteTypeId" title="${uiLabelMap.OrderOrderQuoteTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="QuoteType" key-field-name="quoteTypeId">
+                <entity-options entity-name="QuoteType" key-field-name="quoteTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="ORDER_SALES_CHANNEL"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -176,7 +176,7 @@ under the License.
         <field name="quoteId"><hidden/></field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -240,14 +240,14 @@ under the License.
         <field name="productFeatureId" title="${uiLabelMap.ProductFeatures}"><lookup target-form-name="LookupProductFeature"/></field>
         <field name="deliverableTypeId" title="${uiLabelMap.OrderOrderQuoteDeliverableTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DeliverableType" key-field-name="deliverableTypeId">
+                <entity-options entity-name="DeliverableType" key-field-name="deliverableTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="skillTypeId" title="${uiLabelMap.OrderOrderQuoteSkillTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="SkillType" key-field-name="skillTypeId">
+                <entity-options entity-name="SkillType" key-field-name="skillTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -417,7 +417,7 @@ under the License.
 
         <field name="quoteAdjustmentTypeId" title="${uiLabelMap.OrderOrderQuoteAdjustmentType}">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="OrderAdjustmentType" key-field-name="orderAdjustmentTypeId"/>
+                <entity-options entity-name="OrderAdjustmentType" key-field-name="orderAdjustmentTypeId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -460,10 +460,10 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="ListQuoteTerms">
         <auto-fields-entity entity-name="QuoteTerm" default-field-type="display"/>
         <field name="termTypeId" >
-            <display-entity entity-name="TermType" description="${description}" key-field-name="termTypeId"/>
+            <display-entity entity-name="TermType" key-field-name="termTypeId"/>
         </field>
         <field name="uomId" title="${uiLabelMap.OrderOrderQuoteUomId}">
-            <display-entity entity-name="Uom" description="${description}" key-field-name="uomId"/>
+            <display-entity entity-name="Uom" key-field-name="uomId"/>
         </field>
         <field name="editLink" title=" " widget-style="buttontext">
             <hyperlink target="EditQuoteTerm" description="${uiLabelMap.CommonEdit}" also-hidden="false">
@@ -526,7 +526,7 @@ under the License.
         <field name="quoteItemSeqId" use-when="quoteItemSeqId!=null" tooltip="${uiLabelMap.CommonRequired}"><display/></field>
         <field name="termTypeId" tooltip="${uiLabelMap.CommonRequired}">
             <drop-down current-description="">
-                <entity-options description="${description}" entity-name="TermType" key-field-name="termTypeId"/>
+                <entity-options entity-name="TermType" key-field-name="termTypeId"/>
             </drop-down>
         </field>
         <field name="termTypeId" use-when="termTypeId!=null" tooltip="${uiLabelMap.CommonRequired}">
@@ -536,7 +536,7 @@ under the License.
         
         <field name="uomId">
             <drop-down current-description="">
-                <entity-options description="${description}" entity-name="Uom" key-field-name="uomId"/>
+                <entity-options entity-name="Uom" key-field-name="uomId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
diff --git a/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml b/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
index 5316876ab5d..73edad44650 100644
--- a/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
+++ b/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml
@@ -33,10 +33,10 @@ under the License.
                 <parameter param-name="quoteId"/>
             </hyperlink>
         </field>
-        <field name="workEffortTypeId"><display-entity entity-name="WorkEffortType" description="${description}"/></field>
+        <field name="workEffortTypeId"><display-entity entity-name="WorkEffortType"/></field>
         <field name="statusItemDescription"><display/></field>
         <field name="description"><display/></field>
-        <field name="workEffortPurposeTypeId"><display-entity entity-name="WorkEffortPurposeType" description="${description}"/></field>
+        <field name="workEffortPurposeTypeId"><display-entity entity-name="WorkEffortPurposeType"/></field>
         <field name="actualStartDate"><display/></field>
         <field name="actualEndDate"><display/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
diff --git a/applications/order/widget/ordermgr/ReportForms.xml b/applications/order/widget/ordermgr/ReportForms.xml
index 712a985d8e7..9c5e806f606 100644
--- a/applications/order/widget/ordermgr/ReportForms.xml
+++ b/applications/order/widget/ordermgr/ReportForms.xml
@@ -33,7 +33,7 @@ under the License.
         <field name="orderTypeId">
             <drop-down allow-empty="false">
                 <option key="" description="- ${uiLabelMap.CommonAny} -"/>
-                <entity-options entity-name="OrderType" description="${description}">
+                <entity-options entity-name="OrderType">
                     <entity-order-by field-name="orderTypeId"/>
                 </entity-options>
             </drop-down>
@@ -51,7 +51,7 @@ under the License.
         <field name="statusId">
             <drop-down allow-empty="false" no-current-selected-key="ORDER_COMPLETED">
                 <option key="" description="- ${uiLabelMap.CommonAny} -"/>
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint value="ORDER_STATUS" name="statusTypeId"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -87,7 +87,7 @@ under the License.
         <field name="orderStatusId">
             <drop-down allow-empty="false">
                 <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="ORDER_STATUS"/>
                 </entity-options>
             </drop-down>
@@ -117,7 +117,7 @@ under the License.
         <field name="orderStatusId">
             <drop-down allow-empty="false">
                 <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="ORDER_STATUS"/>
                 </entity-options>
             </drop-down>
@@ -186,7 +186,7 @@ under the License.
         <field name="orderStatusId">
             <drop-down allow-empty="false">
                 <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="ORDER_STATUS"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/order/widget/ordermgr/RequirementForms.xml b/applications/order/widget/ordermgr/RequirementForms.xml
index c801e3f209f..7a2db344c36 100644
--- a/applications/order/widget/ordermgr/RequirementForms.xml
+++ b/applications/order/widget/ordermgr/RequirementForms.xml
@@ -26,12 +26,12 @@ under the License.
         <field name="requirementId"><text-find/></field>
         <field name="requirementTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RequirementType" description="${description}"/>
+                <entity-options entity-name="RequirementType"/>
             </drop-down>
         </field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="REQUIREMENT_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -81,7 +81,7 @@ under the License.
                 <parameter param-name="requirementId"/>
             </hyperlink>
         </field>
-        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"/></field>
         <field name="requirementTypeId">
             <display-entity entity-name="RequirementType"/>
         </field>
@@ -117,12 +117,12 @@ under the License.
         <field name="requirementId"><hidden/></field>
         <field name="requirementTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="RequirementType" description="${description}"/>
+                <entity-options entity-name="RequirementType"/>
             </drop-down>
         </field>
         <field name="statusId">
             <drop-down allow-empty="false" no-current-selected-key="REQ_CREATED">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="REQUIREMENT_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -200,7 +200,7 @@ under the License.
         <field name="roleTypeId" use-when="requirementRole!=null"><display-entity entity-name="RoleType"/></field>
         <field name="roleTypeId" use-when="requirementRole==null">
             <drop-down allow-empty="false" no-current-selected-key="SUPPLIER">
-                <entity-options entity-name="RoleType" description="${description}"/>
+                <entity-options entity-name="RoleType"/>
             </drop-down>
         </field>
         <field name="fromDate" use-when="requirementRole!=null"><display/></field>
@@ -215,7 +215,7 @@ under the License.
         <field name="requirementId"><text-find/></field>
         <field name="requirementTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RequirementType" description="${description}"/>
+                <entity-options entity-name="RequirementType"/>
             </drop-down>
         </field>
         <field name="facilityId">
diff --git a/applications/order/widget/ordermgr/ReturnForms.xml b/applications/order/widget/ordermgr/ReturnForms.xml
index d772b221029..98c036b3442 100644
--- a/applications/order/widget/ordermgr/ReturnForms.xml
+++ b/applications/order/widget/ordermgr/ReturnForms.xml
@@ -34,12 +34,12 @@ under the License.
         <field use-when="returnHeader==null&amp;&amp;returnId==null" name="returnId"><ignored/></field>
         <field name="returnHeaderTypeId" id-name="returnHeaderTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="ReturnHeaderType" description="${description}"/>
+                <entity-options entity-name="ReturnHeaderType"/>
             </drop-down>
         </field>
         <field name="statusId" use-when="returnHeader==null" id-name="statusId">
             <drop-down>
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="ORDER_RETURN_STTS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -123,7 +123,7 @@ under the License.
         header-row-style="header-row" default-table-style="basic-table">
         <field name="returnHeaderTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ReturnHeaderType" description="${description}"/>
+                <entity-options entity-name="ReturnHeaderType"/>
             </drop-down>
         </field>
         <field name="returnId" title="${uiLabelMap.OrderReturnId}"><text-find/></field>
@@ -135,7 +135,7 @@ under the License.
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="ORDER_RETURN_STTS"/>
                 </entity-options>
             </drop-down>
@@ -181,7 +181,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
     </form>
 
@@ -189,7 +189,7 @@ under the License.
             odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <field name="returnId"><display/></field>
         <field name="returnItemSeqId"><display/></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"/></field>
         <field name="statusDatetime" title="${uiLabelMap.CommonDate}"><display/></field>
         <field name="changeByUserLoginId" title="${uiLabelMap.FormFieldTitle_modifiedByUserLoginId}"><display/></field>
     </form>
@@ -205,10 +205,10 @@ under the License.
             odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <field name="returnId"><display description="${returnId}"/></field>
         <field name="oldValueText">
-            <display-entity entity-name="ReturnReason" description="${description}" key-field-name="returnReasonId"/>
+            <display-entity entity-name="ReturnReason" key-field-name="returnReasonId"/>
         </field>
         <field name="newValueText">
-            <display-entity entity-name="ReturnReason" description="${description}" key-field-name="returnReasonId"/>
+            <display-entity entity-name="ReturnReason" key-field-name="returnReasonId"/>
         </field>
         <field name="changedDate" title="${uiLabelMap.CommonDate}"><display/></field>
         <field name="changedByInfo" title="${uiLabelMap.FormFieldTitle_modifiedByUserLoginId}"><display/></field>
@@ -217,10 +217,10 @@ under the License.
             odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <field name="returnId"><display description="${returnId}"/></field>
         <field name="oldValueText">
-            <display-entity entity-name="ReturnType" description="${description}" key-field-name="returnTypeId"/>
+            <display-entity entity-name="ReturnType" key-field-name="returnTypeId"/>
         </field>
         <field name="newValueText">
-            <display-entity entity-name="ReturnType" description="${description}" key-field-name="returnTypeId"/>
+            <display-entity entity-name="ReturnType" key-field-name="returnTypeId"/>
         </field>
         <field name="changedDate" title="${uiLabelMap.CommonDate}"><display/></field>
         <field name="changedByInfo" title="${uiLabelMap.FormFieldTitle_modifiedByUserLoginId}"><display/></field>
diff --git a/applications/party/widget/partymgr/CommunicationEventForms.xml b/applications/party/widget/partymgr/CommunicationEventForms.xml
index f46551aca6c..a5c8ab49349 100644
--- a/applications/party/widget/partymgr/CommunicationEventForms.xml
+++ b/applications/party/widget/partymgr/CommunicationEventForms.xml
@@ -34,7 +34,7 @@ under the License.
         </field>
         <field name="communicationEventTypeId" >
             <drop-down>
-                <entity-options entity-name="CommunicationEventType" description="${description}">
+                <entity-options entity-name="CommunicationEventType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -43,7 +43,7 @@ under the License.
         <!-- status -->
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
             <drop-down>
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -59,7 +59,7 @@ under the License.
 
         <field name="contactMechTypeId">
             <drop-down>
-                 <entity-options description="${description}" entity-name="ContactMechType"/>
+                 <entity-options entity-name="ContactMechType"/>
             </drop-down>
         </field>
 
@@ -73,7 +73,7 @@ under the License.
 
         <field name="roleTypeIdFrom" position="1">
             <drop-down no-current-selected-key="_NA_">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -81,7 +81,7 @@ under the License.
 
         <field name="roleTypeIdTo" position="2">
             <drop-down no-current-selected-key="_NA_">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -102,7 +102,7 @@ under the License.
 
         <field name="reasonEnumId" position="2">
             <drop-down no-current-selected-key="" allow-empty="true">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="CE_COMM_REASON"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -231,7 +231,7 @@ under the License.
                 <parameter param-name="communicationEventId" from-field="communicationEvent.communicationEventId"/>
             </hyperlink>
         </field>
-        <field name="communicationEventTypeId"><display-entity entity-name="CommunicationEventType" description="${description}"/></field>
+        <field name="communicationEventTypeId"><display-entity entity-name="CommunicationEventType"/></field>
         <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})">
@@ -247,7 +247,7 @@ under the License.
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="statusId"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="lastUpdatedStamp" title="${uiLabelMap.FormFieldTitle_lastModifiedDate}"><display/></field>
         <field name="datetimeStarted" title="${uiLabelMap.CommonSendDate}"><display type="date"/></field>
         <field name="datetimeEnded" title="${uiLabelMap.CommonEndDate}"><display type="date"/></field>
@@ -304,14 +304,14 @@ under the License.
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="statusId"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field>
-        <field name="contactMechTypeId" use-when="&quot;my&quot;==void"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+        <field name="contactMechTypeId" use-when="&quot;my&quot;==void"><display-entity entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
         <field name="contactMechIdFrom" use-when="&quot;my&quot;==void" title="${uiLabelMap.PartyFromContactMech}"><display/></field>
         <field name="contactMechIdTo" use-when="&quot;my&quot;==void" title="${uiLabelMap.PartyToEmailAddress}">
             <display-entity entity-name="ContactMech" key-field-name="contactMechId" description="${infoString}"/>
         </field>
-        <field name="roleTypeIdFrom" use-when="&quot;my&quot;==void"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
-        <field name="roleTypeIdTo" use-when="&quot;my&quot;==void"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
+        <field name="roleTypeIdFrom" use-when="&quot;my&quot;==void"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
+        <field name="roleTypeIdTo" use-when="&quot;my&quot;==void"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
         <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field>
         <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field>
         <field name="subject"><display/></field>
@@ -354,36 +354,36 @@ under the License.
         <field name="partyId" position="1" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.PartyAnyRole}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId" position="2">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType">
+                <entity-options entity-name="RoleType">
                     <entity-constraint name="parentTypeId" value="COMMEVENT_ROLE"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="communicationEventTypeId" position="1">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/>
+                <entity-options entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/>
             </drop-down>
         </field>
         <field name="statusId" position="2">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_STATUS"/>
                 </entity-options>
             </drop-down>
         </field>
         <!-- <field name="contactMechTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
+                <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
             </drop-down>
         </field-->
         <!--field name="roleTypeIdFrom">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId"/>
             </drop-down>
         </field>
         <field name="roleTypeIdTo">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId"/>
             </drop-down>
         </field-->
         <!-- <field name="custRequestId"><lookup size="20" target-form-name="LookupCustRequest"/></field-->
@@ -391,7 +391,7 @@ under the License.
         <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><date-find/></field>
         <field name="reasonEnumId">
             <drop-down no-current-selected-key="" allow-empty="true">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="CE_COMM_REASON"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -415,9 +415,9 @@ under the License.
                 <parameter param-name="headerItem" from-field="parameters.headerItem"/>
             </hyperlink>
         </field>
-        <field name="communicationEventTypeId" title="${uiLabelMap.CommonType}" sort-field="true"><display-entity description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/></field>
+        <field name="communicationEventTypeId" title="${uiLabelMap.CommonType}" sort-field="true"><display-entity entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/></field>
         <field name="statusId" sort-field="true">
-            <display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="partyId" title="${uiLabelMap.CommonPartyId}" sort-field="true">
             <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId">
@@ -427,10 +427,10 @@ under the License.
             </display-entity>
         </field>
         <field name="roleTypeId" sort-field="true">
-            <display-entity description="${description}" entity-name="RoleType"/>
+            <display-entity entity-name="RoleType"/>
         </field>
         <field name="roleStatusId" sort-field="true">
-            <display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="entryDate" title="${uiLabelMap.CommonCreated}" sort-field="true"><display type="date"/></field>
         <field name="datetimeStarted" title="${uiLabelMap.CommonSent}" sort-field="true"><display type="date"/></field>
@@ -446,12 +446,12 @@ under the License.
         <field name="partyId" position="1" title="${uiLabelMap.CommonPartyId} ${uiLabelMap.PartyAnyRole}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="communicationEventTypeId" position="2">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/>
+                <entity-options entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/>
             </drop-down>
         </field>
         <field name="statusId" position="2">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_STATUS"/>
                 </entity-options>
             </drop-down>
@@ -522,7 +522,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="communicationEventTypeId">
-            <display-entity entity-name="CommunicationEventType" description="${description}"/>
+            <display-entity entity-name="CommunicationEventType"/>
         </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">
@@ -539,7 +539,7 @@ under the License.
             </display-entity>
         </field>
         <field name="statusId" entry-name="roleStatusId" widget-style="buttontext" widget-area-style="fieldWidth300">
-            <display-entity entity-name="StatusItem" description="${description}">
+            <display-entity entity-name="StatusItem">
                 <sub-hyperlink target="setCommunicationEventRoleStatus"
                     description="${uiLabelMap.${toComplete}}">
                     <parameter param-name="communicationEventId"/>
@@ -551,7 +551,7 @@ under the License.
             </display-entity>
         </field>
         <field name="entryDate" sort-field="true"><display type="date-time"/></field>
-        <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
+        <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
         <field name="removeButton" widget-style="smallSubmit"><submit/></field>
     </form>
     <form name="ListPendingCommEvents" type="list" extends="ListCommEvents" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
@@ -654,7 +654,7 @@ under the License.
             </entity-and>
         </actions>
         <field name="communicationEventPrpTypId">
-            <display-entity description="${description}" entity-name="CommunicationEventPrpTyp"/>
+            <display-entity entity-name="CommunicationEventPrpTyp"/>
         </field>
         <field name="removeLink" title=" " widget-style="smallSubmit">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeCommunicationEventPurpose">
@@ -670,7 +670,7 @@ under the License.
         <field name="partyId"><hidden/></field>
         <field name="communicationEventPrpTypId" >
             <drop-down>
-                <entity-options description="${description}" entity-name="CommunicationEventPrpTyp" key-field-name="communicationEventPrpTypId">
+                <entity-options entity-name="CommunicationEventPrpTyp" key-field-name="communicationEventPrpTypId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -694,8 +694,8 @@ under the License.
             </display-entity>
         </field>
         <field name="contactMechId"><display-entity description="${infoString}" entity-name="ContactMech"/></field>
-        <field name="roleTypeId"><display-entity description="${description}" entity-name="RoleType"/></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"/></field>
         <field name="removeButton" widget-style="smallSubmit"><submit/></field>
     </form>
 
@@ -715,7 +715,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyPartyId}" position="1"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId" position="2">
             <drop-down>
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-constraint name="parentTypeId" value="COMMEVENT_ROLE"/>
                     <entity-constraint name="roleTypeId" operator="not-equals" value="ORIGINATOR"/>
                     <entity-order-by field-name="description"/>
@@ -816,7 +816,7 @@ under the License.
         </field>
         <field name="dataResourceTypeId" entry-name="drDataResourceTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="DataResourceType" description="${description}"/>
+                <entity-options entity-name="DataResourceType"/>
             </drop-down>
         </field>
         <!-- <field name="mimeTypeId" map-name="dataResource" title="Document Type"><display/></field> -->
@@ -965,7 +965,7 @@ under the License.
         <field name="fromPartyId" entry-name="partyIdFrom"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} [${partyId}]"/></field>
         <field name="custRequestTypeId" >
             <drop-down>
-                <entity-options entity-name="CustRequestType" description="${description}">
+                <entity-options entity-name="CustRequestType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1028,7 +1028,7 @@ under the License.
         </field>
         <field name="communicationEventId"><hidden/></field>
         <field name="orderTypeId" title="${uiLabelMap.OrderOrderType}">
-            <display-entity entity-name="OrderType" key-field-name="orderTypeId" description="${description}"/>
+            <display-entity entity-name="OrderType" key-field-name="orderTypeId"/>
         </field>
         <field name="createdBy" title="${uiLabelMap.CommonCreatedBy}">
             <display description="${orderHeader.createdBy}"/>
diff --git a/applications/party/widget/partymgr/LookupForms.xml b/applications/party/widget/partymgr/LookupForms.xml
index 2d0b7826e60..66deba9d3d3 100644
--- a/applications/party/widget/partymgr/LookupForms.xml
+++ b/applications/party/widget/partymgr/LookupForms.xml
@@ -27,7 +27,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
         <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="PartyType"/>
+                <entity-options entity-name="PartyType"/>
             </drop-down>
         </field>
         <field name="firstName" title="${uiLabelMap.PartyFirstName}"><text-find/></field>
@@ -50,7 +50,7 @@ under the License.
             <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
         </field>
         <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
-            <display-entity also-hidden="false" entity-name="PartyType" description="${description}"/>
+            <display-entity also-hidden="false" entity-name="PartyType"/>
         </field>
         <field name="firstName" title="${uiLabelMap.PartyFirstName}"><display/></field>
         <field name="lastName"  title="${uiLabelMap.PartyLastName}"><display/></field>
@@ -62,7 +62,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
         <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="PartyType"/>
+                <entity-options entity-name="PartyType"/>
             </drop-down>
         </field>
         <field name="firstName" title="${uiLabelMap.PartyFirstName}"><text-find/></field>
@@ -99,7 +99,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
         <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="PartyType"/>
+                <entity-options entity-name="PartyType"/>
             </drop-down>
         </field>
         <field name="firstName" title="${uiLabelMap.PartyFirstName}"><text-find/></field>
@@ -120,7 +120,7 @@ under the License.
             <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
         </field>
         <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
-            <display-entity also-hidden="false" entity-name="PartyType" description="${description}"/>
+            <display-entity also-hidden="false" entity-name="PartyType"/>
         </field>
         <field name="firstName" title="${uiLabelMap.PartyFirstName}"><display/></field>
         <field name="lastName"  title="${uiLabelMap.PartyLastName}"><display/></field>
@@ -137,7 +137,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
         <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="PartyType"/>
+                <entity-options entity-name="PartyType"/>
             </drop-down>
         </field>
         <field name="firstName" title="${uiLabelMap.PartyFirstName}"><text-find/></field>
@@ -161,7 +161,7 @@ under the License.
             <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
         </field>
         <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
-            <display-entity also-hidden="false" entity-name="PartyType" description="${description}"/>
+            <display-entity also-hidden="false" entity-name="PartyType"/>
         </field>
         <field name="firstName" title="${uiLabelMap.PartyFirstName}"><display/></field>
         <field name="lastName"  title="${uiLabelMap.PartyLastName}"><display/></field>
@@ -285,7 +285,7 @@ under the License.
         <auto-fields-entity entity-name="PartyClassificationGroup" default-field-type="find"/>
         <field name="partyClassificationTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="PartyClassificationType" description="${description}">
+                <entity-options entity-name="PartyClassificationType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -321,28 +321,28 @@ under the License.
         <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><lookup  target-form-name="LookupPartyName"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_STATUS"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId">
+                <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -375,10 +375,10 @@ under the License.
         <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}">
             <display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" key-field-name="partyId"/>
         </field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field>
-        <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
-        <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
-        <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
+        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+        <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
+        <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
+        <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
         <field name="custRequestId" position="1" title="${uiLabelMap.PartyServicemgntCustRequestId}"><display/></field>
         <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field>
         <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field>
@@ -389,14 +389,14 @@ under the License.
         <field name="contactMechId"><text-find/></field>
         <field name="contactMechTypeId">
             <drop-down allow-empty="true" no-current-selected-key="EMAIL_ADDRESS">
-                <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId">
+                <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="PartyType"/>
+                <entity-options entity-name="PartyType"/>
             </drop-down>
         </field>
         <field name="infoString"><text-find/></field>
@@ -420,7 +420,7 @@ under the License.
             <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" description="${description}"/>
+            <display-entity also-hidden="false" entity-name="PartyType"/>
         </field>
         <field name="contactMechTypeId"><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>
diff --git a/applications/party/widget/partymgr/PartyClassificationForms.xml b/applications/party/widget/partymgr/PartyClassificationForms.xml
index b736dbbbfaf..8ea0298aa96 100644
--- a/applications/party/widget/partymgr/PartyClassificationForms.xml
+++ b/applications/party/widget/partymgr/PartyClassificationForms.xml
@@ -55,7 +55,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="partyClassificationTypeId">
-            <display-entity entity-name="PartyClassificationType" key-field-name="partyClassificationTypeId" description="${description}"/>
+            <display-entity entity-name="PartyClassificationType" key-field-name="partyClassificationTypeId"/>
         </field>
         <field name="parentGroupId"><display/></field>
         <field name="description" title=" "><display/></field>
@@ -74,7 +74,7 @@ under the License.
         <field use-when="partyClassificationGroup==null&amp;&amp;partyClassificationGroupId!=null" name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${partyClassificationGroupId}]"><display/></field>
         <field name="partyClassificationTypeId">
             <drop-down>
-                <entity-options description="${description}" entity-name="PartyClassificationType" key-field-name="partyClassificationTypeId">
+                <entity-options entity-name="PartyClassificationType" key-field-name="partyClassificationTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -89,7 +89,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><display/></field>
         <field name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}">
             <drop-down>
-                <entity-options description="${description}" entity-name="PartyClassificationGroup" key-field-name="partyClassificationGroupId">
+                <entity-options entity-name="PartyClassificationGroup" key-field-name="partyClassificationGroupId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -107,7 +107,7 @@ under the License.
     <form name="AddPartyClassificationParty" type="single" target="createPartyClassificationParty" default-map-name="partyClassification"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}">
-            <display-entity entity-name="PartyClassificationGroup" description="${description}" key-field-name="partyClassificationGroupId"/>
+            <display-entity entity-name="PartyClassificationGroup" key-field-name="partyClassificationGroupId"/>
         </field>
         <field name="partyId"  title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field>
diff --git a/applications/party/widget/partymgr/PartyContactListForms.xml b/applications/party/widget/partymgr/PartyContactListForms.xml
index 0fc78ecde7f..cfff3925665 100644
--- a/applications/party/widget/partymgr/PartyContactListForms.xml
+++ b/applications/party/widget/partymgr/PartyContactListForms.xml
@@ -49,7 +49,7 @@ under the License.
         <field name="thruDate"><date-time/></field>
         <field name="statusId">
             <drop-down>
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="CONTACTLST_PARTY"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -75,7 +75,7 @@ under the License.
         <field name="thruDate"><date-time/></field>
         <field name="statusId">
             <drop-down no-current-selected-key="CLPT_PENDING">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="CONTACTLST_PARTY" operator="equals"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -101,8 +101,8 @@ under the License.
             <hyperlink also-hidden="false" target-type="plain" description="${contactListId}" target="javascript:set_value('${contactListId}')"/>
         </field>
         <field name="contactListName"><display/></field>
-        <field name="contactListTypeId"><display-entity description="${description}" entity-name="ContactListType"/></field>
-        <field name="contactMechTypeId" title="${uiLabelMap.PartyContactMechType}"><display-entity description="${description}" entity-name="ContactMechType"/></field>
+        <field name="contactListTypeId"><display-entity entity-name="ContactListType"/></field>
+        <field name="contactMechTypeId" title="${uiLabelMap.PartyContactMechType}"><display-entity entity-name="ContactMechType"/></field>
         <field name="marketingCampaignId"><display-entity entity-name="MarketingCampaign" description="${campaignName}"/></field>
     </form>
 </forms>
diff --git a/applications/party/widget/partymgr/PartyForms.xml b/applications/party/widget/partymgr/PartyForms.xml
index 2293f205a2e..8534969f68d 100644
--- a/applications/party/widget/partymgr/PartyForms.xml
+++ b/applications/party/widget/partymgr/PartyForms.xml
@@ -46,20 +46,20 @@ under the License.
         <field name="partyGroupName" title="${uiLabelMap.PartyGroupName}"><text size="15"/></field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="partyTypeId" title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="PartyType"/>
+                <entity-options entity-name="PartyType"/>
             </drop-down>
         </field>
         <field name="idValue"><text size="15"/></field>
         <field name="partyIdentificationTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="PartyIdentificationType"/>
+                <entity-options entity-name="PartyIdentificationType"/>
             </drop-down>
         </field>
         <field name="address1"><text size="15"/></field>
@@ -79,7 +79,7 @@ under the License.
         </field>
         <field name="partyClassificationGroupId" title=" " use-when="parentTypeId == null">
             <drop-down allow-multiple="true" size="20" allow-empty="true">
-                <entity-options description="${description}" entity-name="PartyClassificationGroupAndType">
+                <entity-options entity-name="PartyClassificationGroupAndType">
                     <entity-order-by field-name="partyClassificationTypeId"/>
                 </entity-options>
             </drop-down>
@@ -236,7 +236,7 @@ under the License.
         <field name="statusId" use-when="person==null"><hidden/></field>
         <field name="statusId" use-when="person!=null &amp;&amp; leadDescription==null">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="PARTY_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -244,7 +244,7 @@ under the License.
         </field>
         <field name="statusId" use-when="person!=null &amp;&amp; leadDescription!=null">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusId" operator="in" value="LEAD_ASSIGNED,PARTY_ENABLED,PARTY_DISABLED"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -279,7 +279,7 @@ under the License.
         <field name="statusId" use-when="partyGroup==null"><hidden/></field>
         <field name="statusId" use-when="partyGroup!=null">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="PARTY_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -300,9 +300,9 @@ under the License.
         <field name="comments"><ignored/></field>
         <field name="logoImageUrl"><ignored/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
-        <field name="preferredCurrencyUomId" title="${uiLabelMap.CommonCurrency}"><display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/></field>
+        <field name="preferredCurrencyUomId" title="${uiLabelMap.CommonCurrency}"><display-entity entity-name="Uom" key-field-name="uomId"/></field>
         <field name="externalId"><display/></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <sort-order>
             <sort-field name="logo"/>
             <sort-field name="partyId"/>
@@ -325,7 +325,7 @@ under the License.
         <field name="name" title="${uiLabelMap.PartyName}"><display description="${lookupPerson.personalTitle} ${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName}"/></field>
         <field name="comments" title="${uiLabelMap.PartyComments}"><display/></field>
         <field name="externalId"><display/></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
     </form>
 
     <form name="ViewPartyPersonHistory" type="list" list-name="partyNameHistoryList"
@@ -425,14 +425,14 @@ under the License.
         </field>
         <field name="roleTypeIdValidFrom" title="${uiLabelMap.PartyRelationshipValidFromRoleType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" key-field-name="roleTypeId" description="${description}">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="roleTypeIdValidTo" title="${uiLabelMap.PartyRelationshipValidToRoleType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" key-field-name="roleTypeId" description="${description}">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -538,7 +538,7 @@ under the License.
         <field name="partyId"><hidden/></field>
         <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD" allow-empty="false">
-                <entity-options entity-name="RateType" description="${description}">
+                <entity-options entity-name="RateType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -581,7 +581,7 @@ under the License.
         <field name="rateAmountFromDate"><hidden/></field>
         <field name="rateCurrencyUomId"><hidden/></field>
         <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}"><display-entity entity-name="RateType" also-hidden="true"/></field>
-        <field name="periodTypeId"><display-entity entity-name="PeriodType" description="${description}"/></field>
+        <field name="periodTypeId"><display-entity entity-name="PeriodType"/></field>
         <field name="rateDefaultAmount" use-when="&quot;workEffort&quot;.equals(rateLevel)" tooltip="${uiLabelMap.PartyValueFromWorkEffortLevel}"><display type="currency" currency="${rateCurrencyUomId}"/></field>
         <field name="rateDefaultAmount" use-when="&quot;party&quot;.equals(rateLevel)" tooltip="${uiLabelMap.PartyValueFromPartyLevel}"><display type="currency" currency="${rateCurrencyUomId}"/></field>
         <field name="rateDefaultAmount" use-when="&quot;rateType&quot;.equals(rateLevel)" tooltip="${uiLabelMap.PartyValueFromRateTypeLevel}"><display type="currency" currency="${rateCurrencyUomId}"/></field>
@@ -677,7 +677,7 @@ under the License.
             </display-entity>
         </field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRole}">
-            <display-entity entity-name="RoleType" description="${description}"/>
+            <display-entity entity-name="RoleType"/>
         </field>
         <field name="deleteLink" title=" " widget-style="smallSubmit">
             <hyperlink target="deleteSegmentGroupRole" description="${uiLabelMap.CommonDelete}" also-hidden="false">
@@ -696,7 +696,7 @@ under the License.
         <field name="partyId"><hidden/></field>
         <field name="roleTypeId">
             <drop-down>
-                <entity-options description="${description}" entity-name="RoleType">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -743,7 +743,7 @@ under the License.
         <field use-when="content!=null" name="contentId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
         <field name="partyContentTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="PartyContentType"/>
+                <entity-options entity-name="PartyContentType"/>
             </drop-down>
         </field>
         <!-- note sure if these two are necessray, but they are kind of confusing in this context:
@@ -752,12 +752,12 @@ under the License.
         -->
         <field name="contentTypeId">
             <drop-down allow-empty="false" no-current-selected-key="DOCUMENT">
-                <entity-options description="${description}" entity-name="ContentType"/>
+                <entity-options entity-name="ContentType"/>
             </drop-down>
         </field>
         <field name="statusId" use-when="content==null">
             <drop-down allow-empty="false" no-current-selected-key="CTNT_AVAILABLE">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="CONTENT_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -773,7 +773,7 @@ under the License.
         </field>
         <field name="mimeTypeId" >
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="MimeType"/>
+                <entity-options entity-name="MimeType"/>
             </drop-down>
         </field>
         <field name="dataResourceName" title="${uiLabelMap.CommonUpload}"><file/></field>
@@ -912,17 +912,17 @@ under the License.
 
     <form name="ListSubscriptions" type="list" list-name="subscriptionList" default-table-style="basic-table">
         <field name="subscriptionId">
-            <display-entity entity-name="Subscription" description="${description}">
+            <display-entity entity-name="Subscription">
                 <sub-hyperlink description="[${subscriptionId}]" target="/catalog/control/EditSubscription" target-type="inter-app">
                     <parameter param-name="subscriptionId"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="subscriptionTypeId" title="${uiLabelMap.ProductSubscription} ${uiLabelMap.CommonType}">
-            <display-entity entity-name="SubscriptionType" description="${description}"/>
+            <display-entity entity-name="SubscriptionType"/>
         </field>
         <field name="subscriptionResourceId">
-            <display-entity entity-name="SubscriptionResource" description="${description}"/>
+            <display-entity entity-name="SubscriptionResource"/>
         </field>
         <field name="description"><display/></field>
         <field name="productId">
@@ -970,7 +970,7 @@ under the License.
             </display-entity>
         </field>
         <field name="roleTypeIdTo" title="${uiLabelMap.PartyPartyInTheRoleOf}">
-            <display-entity entity-name="RoleType" key-field-name="roleTypeId" description="${description}"/>
+            <display-entity entity-name="RoleType" key-field-name="roleTypeId"/>
         </field>
         <field name="partyRelationshipTypeId" title="${uiLabelMap.PartyIsA}"><display-entity entity-name="PartyRelationshipType" description="${partyRelationshipName}"/></field>
         <field name="partyIdFrom" title="${uiLabelMap.PartyOfParty}">
@@ -981,7 +981,7 @@ under the License.
             </display-entity>
         </field>
         <field name="roleTypeIdFrom" title="${uiLabelMap.PartyPartyInTheRoleOf}">
-            <display-entity entity-name="RoleType" key-field-name="roleTypeId" description="${description}"/>
+            <display-entity entity-name="RoleType" key-field-name="roleTypeId"/>
         </field>
         <field name="fromDate"><display type="date"/></field>
         <field name="thruDate"><date-time/></field>
@@ -1002,7 +1002,7 @@ under the License.
         <field name="partyIdTo" entry-name="parameters.partyId"><display/></field>
         <field name="roleTypeIdTo" title="${uiLabelMap.PartyPartyInTheRoleOf}">
             <drop-down allow-empty="false" no-current-selected-key="_NA_">
-                <entity-options entity-name="RoleTypeAndParty" key-field-name="roleTypeId" description="${description}">
+                <entity-options entity-name="RoleTypeAndParty" key-field-name="roleTypeId">
                     <entity-constraint name="partyId" value="${partyId}"/>
                     <entity-order-by field-name="description"/>
                     <entity-order-by field-name="roleTypeId"/>
@@ -1019,14 +1019,14 @@ under the License.
         <field name="partyIdFrom"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeIdFrom" title="${uiLabelMap.PartyPartyInTheRoleOf}">
             <drop-down allow-empty="false" no-current-selected-key="_NA_">
-                <entity-options entity-name="RoleType" key-field-name="roleTypeId" description="${description}">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="PARTY_REL_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -1036,7 +1036,7 @@ under the License.
         <field name="thruDate"><date-time/></field>
         <field name="groupId" title="${uiLabelMap.CommonSecurityGroupId}">
             <drop-down allow-empty="true" text-size="60">
-                <entity-options entity-name="SecurityGroup" description="${description}">
+                <entity-options entity-name="SecurityGroup">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1080,7 +1080,7 @@ under the License.
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="invoiceTypeId"><display-entity entity-name="InvoiceType" description="${description}"/></field>
+        <field name="invoiceTypeId"><display-entity entity-name="InvoiceType"/></field>
         <field name="invoiceDate"><display type="date"/></field>
         <field name="total"><display type="currency" currency="${actualCurrencyUomId}"/></field>
         <field name="amountToApply"><display type="currency" currency="${actualCurrencyUomId}"/></field>
@@ -1104,14 +1104,14 @@ under the License.
             <script location="component://party/webapp/partymgr/WEB-INF/actions/party/UnAppliedInvoicesForParty.groovy"/>
         </actions>
         <field name="invoiceId">
-            <display-entity entity-name="Invoice" description="${description}">
+            <display-entity entity-name="Invoice">
                 <sub-hyperlink target="/accounting/control/invoiceOverview" description="[${invoiceId}]" target-type="inter-app">
                     <parameter param-name="invoiceId"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="invoiceParentTypeId">
-            <display-entity entity-name="InvoiceType" key-field-name="invoiceTypeId" description="${description}"/>
+            <display-entity entity-name="InvoiceType" key-field-name="invoiceTypeId"/>
         </field>
         <field name="invoiceDate"><display type="date"/></field>
         <field name="amount"><display type="currency" currency="${invoiceCurrencyUomId}"/></field>
@@ -1134,10 +1134,10 @@ under the License.
         </field>
         <field name="effectiveDate"><display type="date"/></field>
         <field name="paymentTypeId">
-            <display-entity entity-name="PaymentType" description="${description}"/>
+            <display-entity entity-name="PaymentType"/>
         </field>
         <field name="paymentParentTypeId">
-            <display-entity entity-name="PaymentType" key-field-name="paymentTypeId" description="${description}"/>
+            <display-entity entity-name="PaymentType" key-field-name="paymentTypeId"/>
         </field>
         <field name="amount"><display type="currency" currency="${paymentCurrencyUomId}"/></field>
         <field name="unAppliedAmount"><display type="currency" currency="${paymentCurrencyUomId}"/></field>
@@ -1164,7 +1164,7 @@ under the License.
        >
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}"><display/></field>
         <field name="description" title="${uiLabelMap.PartyRole}"><display/></field>
-        <field name="parentTypeId"><display-entity entity-name="RoleType" key-field-name="roleTypeId" description="${description}"/></field>
+        <field name="parentTypeId"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
         <field name="remove">
             <hyperlink target="deleterole" description="${uiLabelMap.CommonRemove}">
                 <parameter param-name="partyId"/>
@@ -1193,7 +1193,7 @@ under the License.
         <field name="partyId"><hidden value="${parameters.partyId}"/></field>
         <field name="roleTypeId" event="onChange" action="ajaxUpdateArea('addPartySecondaryRole', 'addsecondaryroles', jQuery('#AddPartyMainRole').serialize());" entry-name="dummy">
             <drop-down allow-empty="false">
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1204,7 +1204,7 @@ under the License.
         <field name="partyId"><hidden value="${parameters.partyId}"/></field>
         <field name="roleTypeId" entry-name="dummy">
             <drop-down allow-empty="false">
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-constraint name="parentTypeId" value="${parameters.roleTypeId}"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -1248,7 +1248,7 @@ under the License.
     </form>
     <form name="PartyReturns" type="list" list-name="returnList" default-table-style="basic-table hover-bar">
         <field name="returnId"><display/></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"/></field>
         <field name="fromPartyId"><display/></field>
         <field name="toPartyId"><display/></field>
     </form>
@@ -1258,7 +1258,7 @@ under the License.
                 <parameter param-name="salesOpportunityId"/>
             </hyperlink>
         </field>
-        <field name="opportunityStageId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="SalesOpportunityStage" description="${description}"/></field>
+        <field name="opportunityStageId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="SalesOpportunityStage"/></field>
         <field name="estimatedAmount" title="${uiLabelMap.SfaEstimatedAmount}"><display/></field>
         <field name="partyId"><display/></field>
     </form>
@@ -1288,7 +1288,7 @@ under the License.
         <alt-target use-when="partyIdentification !=null" target="updatePartyIdentification"/>
         <field name="partyIdentificationTypeId" use-when="partyIdentification == null">
             <drop-down>
-                <entity-options description="${description}" entity-name="PartyIdentificationType">
+                <entity-options entity-name="PartyIdentificationType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/party/widget/partymgr/PartyInvitationForms.xml b/applications/party/widget/partymgr/PartyInvitationForms.xml
index b6f655b2c8e..f7f2a6032a0 100644
--- a/applications/party/widget/partymgr/PartyInvitationForms.xml
+++ b/applications/party/widget/partymgr/PartyInvitationForms.xml
@@ -30,7 +30,7 @@ under the License.
         <field position="2" name="datefrom" title="${uiLabelMap.CommonFromDate}"><date-time/></field>
         <field name="statusId" position="1">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="PARTY_INV_STATUS"/>
                     <entity-order-by field-name="statusId"/>
                 </entity-options>
@@ -66,7 +66,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><display/></field>
         <field name="toName" title="${uiLabelMap.PartyToName}"><display/></field>
         <field name="emailAddress" title="${uiLabelMap.PartyEmailAddress}"><display/></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"/></field>
         <field name="lastInviteDate"><display/></field>
         <field name="remove" title=" " widget-style="buttontext">
             <hyperlink target="deletePartyInvitation" description="${uiLabelMap.CommonDelete}">
@@ -88,7 +88,7 @@ under the License.
         </field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="PARTY_INV_STATUS"/>
                     <entity-order-by field-name="statusId"/>
                 </entity-options>
@@ -169,7 +169,7 @@ under the License.
         <field name="partyInvitationId"><hidden/> </field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="roleTypeId"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/product/widget/catalog/CategoryForms.xml b/applications/product/widget/catalog/CategoryForms.xml
index 90a8cc18993..1d8b1f27726 100644
--- a/applications/product/widget/catalog/CategoryForms.xml
+++ b/applications/product/widget/catalog/CategoryForms.xml
@@ -48,7 +48,7 @@ under the License.
         </field>
         <field name="prodCatContentTypeId">
             <drop-down>
-                <entity-options entity-name="ProductCategoryContentType" description="${description}">
+                <entity-options entity-name="ProductCategoryContentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -62,7 +62,7 @@ under the License.
         <field name="productCategoryId" map-name="productCategory"><hidden/></field>
         <field name="prodCatContentTypeId">
             <drop-down>
-                <entity-options entity-name="ProductCategoryContentType" description="${description}">
+                <entity-options entity-name="ProductCategoryContentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -75,7 +75,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="productCategoryId"><hidden/></field>
         <field name="contentId" title="${uiLabelMap.ProductContent}">
-            <display-entity entity-name="Content" description="${description}" also-hidden="true">
+            <display-entity entity-name="Content" also-hidden="true">
                 <sub-hyperlink target="EditCategoryContentContent" description="${contentId}" link-style="buttontext">
                     <parameter param-name="productCategoryId"/>
                     <parameter param-name="contentId"/>
@@ -85,7 +85,7 @@ under the License.
             </display-entity>
         </field>
         <field name="prodCatContentTypeId" title="${uiLabelMap.ProductType}">
-            <display-entity entity-name="ProductCategoryContentType" also-hidden="false" description="${description}"/>
+            <display-entity entity-name="ProductCategoryContentType" also-hidden="false"/>
         </field>
         <field name="fromDate"><display/></field>
         <field name="thruDate"><display/></field>
@@ -94,7 +94,7 @@ under the License.
         <field name="thruDate"><date-time type="timestamp"/></field>
         <field name="prodCatContentTypeId">
             <drop-down>
-                <entity-options entity-name="ProductCategoryContentType" description="${description}">
+                <entity-options entity-name="ProductCategoryContentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -250,7 +250,7 @@ under the License.
             </hyperlink>
         </field>
         
-        <field name="productCategoryTypeId" sort-field="true"><display-entity entity-name="ProductCategoryType" description="${description}"/></field>
+        <field name="productCategoryTypeId" sort-field="true"><display-entity entity-name="ProductCategoryType"/></field>
         <field name="primaryParentCategoryId" sort-field="true"><display/></field>
         <field name="categoryName" sort-field="true"><display/></field>
         <field name="description" sort-field="true"><display/></field>
diff --git a/applications/product/widget/catalog/ConfigForms.xml b/applications/product/widget/catalog/ConfigForms.xml
index cfb588a2abd..d66dccd0942 100644
--- a/applications/product/widget/catalog/ConfigForms.xml
+++ b/applications/product/widget/catalog/ConfigForms.xml
@@ -119,7 +119,7 @@ under the License.
         <field name="contentId" title="${uiLabelMap.ProductContentId}" ></field>
         <field name="confItemContentTypeId" title="${uiLabelMap.ProductProductConfigItemContentTypeId}">
             <drop-down>
-                <entity-options entity-name="ProdConfItemContentType" description="${description}">
+                <entity-options entity-name="ProdConfItemContentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -137,7 +137,7 @@ under the License.
         <field name="configItemId" map-name="productConfigItem"><hidden/></field>
         <field name="confItemContentTypeId" title="${uiLabelMap.ProductProductConfigItemContentTypeId}">
             <drop-down>
-                <entity-options entity-name="ProdConfItemContentType" description="${description}">
+                <entity-options entity-name="ProdConfItemContentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -158,7 +158,7 @@ under the License.
         </field>
         <field name="confItemContentTypeId" title="${uiLabelMap.ProductProductContentTypeId}">
             <drop-down>
-                <entity-options entity-name="ProdConfItemContentType" description="${description}">
+                <entity-options entity-name="ProdConfItemContentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/product/widget/catalog/FeatureForms.xml b/applications/product/widget/catalog/FeatureForms.xml
index 0815e3fb4dd..2a2dd9e418f 100644
--- a/applications/product/widget/catalog/FeatureForms.xml
+++ b/applications/product/widget/catalog/FeatureForms.xml
@@ -34,7 +34,7 @@
 
         <field name="productFeatureTypeId" title="${uiLabelMap.ProductFeatureType}">
             <drop-down>
-                <entity-options entity-name="ProductFeatureType" description="${description}">
+                <entity-options entity-name="ProductFeatureType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -133,7 +133,7 @@
         </field>
         <field name="description"><display/></field>
         <field name="parentTypeId">
-            <display-entity entity-name="ProductFeatureType" description="${description}" key-field-name="productFeatureTypeId">
+            <display-entity entity-name="ProductFeatureType" key-field-name="productFeatureTypeId">
                 <sub-hyperlink target="EditFeatureType" description="${parentTypeId}">
                     <parameter param-name="productFeatureTypeId" from-field="parentTypeId"/>
                 </sub-hyperlink>
@@ -153,7 +153,7 @@
         <field use-when="productFeatureType==null&amp;&amp;productFeatureTypeId!=null" name="productFeatureTypeId" title="${uiLabelMap.ProductFeatureType}" tooltip="${uiLabelMap.ProductCouldNotFindProductFeatureType} [${productFeatureTypeId}]"><text size="20" maxlength="20"/></field>
         <field name="parentTypeId" title="${uiLabelMap.ProductParentType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ProductFeatureType" key-field-name="productFeatureTypeId" description="${description}">
+                <entity-options entity-name="ProductFeatureType" key-field-name="productFeatureTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -181,14 +181,14 @@
             </actions>
 
         <field name="productFeatureId">
-            <display-entity entity-name="ProductFeature" description="${description}">
+            <display-entity entity-name="ProductFeature">
                 <sub-hyperlink target="EditFeature" description="[${productFeatureId}]">
                 <parameter param-name="productFeatureId"/>
             </sub-hyperlink>
             </display-entity>
         </field>
         <field name="productFeatureIdTo">
-            <display-entity entity-name="ProductFeature" description="${description}" key-field-name="productFeatureId">
+            <display-entity entity-name="ProductFeature" key-field-name="productFeatureId">
                 <sub-hyperlink target="EditFeature" description="[${productFeatureIdTo}]">
                 <parameter param-name="productFeatureId" from-field="productFeatureIdTo"/>
             </sub-hyperlink>
@@ -223,7 +223,7 @@
         </field>
         <field name="productFeatureIactnTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="ProductFeatureIactnType">
+                <entity-options entity-name="ProductFeatureIactnType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -267,7 +267,7 @@
         <field name="productFeatureGroupId"><hidden/></field>
         <field name="productFeatureCategoryId">
             <drop-down>
-                <list-options key-name="productFeatureCategoryId" list-name="productFeatureCategories" description="${description}"/>
+                <list-options key-name="productFeatureCategoryId" list-name="productFeatureCategories"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonContinue}" widget-style="smallSubmit">
@@ -322,7 +322,7 @@
         <field name="description" title="${uiLabelMap.CommonDescription}*"><text size="25"></text></field>
         <field name="parentCategory" title="${uiLabelMap.ProductParentCategory}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ProductFeatureCategory" key-field-name="description">
+                <entity-options entity-name="ProductFeatureCategory" key-field-name="description">
                 </entity-options>
             </drop-down>
         </field>
@@ -360,7 +360,7 @@
         <field name="productFeatureId"><hidden/></field>
         <field name="productPriceTypeId" title="${uiLabelMap.ProductPriceType}">
             <drop-down allow-empty="false" no-current-selected-key="DEFAULT_PRICE">
-                <entity-options entity-name="ProductPriceType" description="${description}">
+                <entity-options entity-name="ProductPriceType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/product/widget/catalog/FieldLookupForms.xml b/applications/product/widget/catalog/FieldLookupForms.xml
index 0f9c5713558..c83632fdc36 100644
--- a/applications/product/widget/catalog/FieldLookupForms.xml
+++ b/applications/product/widget/catalog/FieldLookupForms.xml
@@ -28,14 +28,14 @@ under the License.
         <field name="internalName" title="${uiLabelMap.ProductInternalName}"><text-find/></field>
         <field name="productTypeId" title="${uiLabelMap.ProductProductType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ProductType" description="${description}">
+                <entity-options entity-name="ProductType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="primaryProductCategoryId" title="${uiLabelMap.ProductPrimaryCategory}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ProductCategory" key-field-name="productCategoryId">
+                <entity-options entity-name="ProductCategory" key-field-name="productCategoryId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -78,7 +78,7 @@ under the License.
         <field name="internalName" title="${uiLabelMap.ProductInternalName}"><text-find/></field>
         <field name="productTypeId" title="${uiLabelMap.ProductProductType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ProductType" description="${description}">
+                <entity-options entity-name="ProductType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -135,7 +135,7 @@ under the License.
         <field name="internalName" title="${uiLabelMap.ProductInternalName}"><text-find/></field>
         <field name="productTypeId" title="${uiLabelMap.ProductProductType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ProductType" description="${description}">
+                <entity-options entity-name="ProductType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
              </drop-down>
@@ -143,7 +143,7 @@ under the License.
         <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field>
         <field name="primaryProductCategoryId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ProductCategory" key-field-name="productCategoryId">
+                <entity-options entity-name="ProductCategory" key-field-name="productCategoryId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -158,13 +158,13 @@ under the License.
         </field>
         <field name="productPriceTypeId" title="${uiLabelMap.ProductPriceType}">
             <drop-down allow-empty="false" no-current-selected-key="DEFAULT_PRICE">
-                <entity-options description="${description}" entity-name="ProductPriceType" key-field-name="productPriceTypeId">
+                <entity-options entity-name="ProductPriceType" key-field-name="productPriceTypeId">
                 </entity-options>
             </drop-down>
         </field>
         <field name="productPricePurposeId">
             <drop-down allow-empty="false" no-current-selected-key="PURCHASE">
-                <entity-options description="${description}" entity-name="ProductPricePurpose" key-field-name="productPricePurposeId">
+                <entity-options entity-name="ProductPricePurpose" key-field-name="productPricePurposeId">
                 </entity-options>
             </drop-down>
         </field>
@@ -215,7 +215,7 @@ under the License.
         <auto-fields-entity entity-name="ProductCategory" default-field-type="find"/>
         <field name="productCategoryTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ProductCategoryType">
+                <entity-options entity-name="ProductCategoryType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -274,14 +274,14 @@ under the License.
         <auto-fields-entity entity-name="ProductFeature" default-field-type="find"/>
         <field name="productFeatureTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ProductFeatureType">
+                <entity-options entity-name="ProductFeatureType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="productFeatureCategoryId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ProductFeatureCategory">
+                <entity-options entity-name="ProductFeatureCategory">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -344,14 +344,14 @@ under the License.
         <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field>
         <field name="costGlAccountTypeId" title="${uiLabelMap.ProductCostGlAccountTypeId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="GlAccountType" description="${description}" key-field-name="glAccountTypeId">
+                <entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="offsettingGlAccountTypeId" title="${uiLabelMap.ProductOffsettingGlAccountTypeId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="GlAccountType" description="${description}" key-field-name="glAccountTypeId">
+                <entity-options entity-name="GlAccountType" key-field-name="glAccountTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/product/widget/catalog/ImageManagementForms.xml b/applications/product/widget/catalog/ImageManagementForms.xml
index 50d3a1c69c8..7b2713a8f9d 100644
--- a/applications/product/widget/catalog/ImageManagementForms.xml
+++ b/applications/product/widget/catalog/ImageManagementForms.xml
@@ -56,7 +56,7 @@ under the License.
         <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"><display/></field>
         <field name="fromDate"><display/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
             <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
@@ -199,11 +199,11 @@ under the License.
         <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}" position="2"><display/></field>
         <field name="fromDate" position="2"><display/></field>
         <field name="statusId" position="2" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="description" position="2" title="${uiLabelMap.ImageManagementRejectedReason}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="IMAGE_REJECT_REASON"/>
                 </entity-options>
             </drop-down>
@@ -254,7 +254,7 @@ under the License.
         <field name="fromDate" position="2"><display/></field>
         <field name="thruDate" position="2"><display/></field>
         <field name="statusId" position="2" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="rejectedBy" position="2" title="${uiLabelMap.ImageManagementRejectedBy}"><display/></field>
         <field name="description" position="2" title="${uiLabelMap.ImageManagementRejectedReason}"><display/></field>
@@ -336,7 +336,7 @@ under the License.
             </display>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
             <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
@@ -470,7 +470,7 @@ under the License.
         <field name="previewButton" title=" " widget-style="buttontext" widget-area-style="preview"><hyperlink target="#" target-type="plain" description="${uiLabelMap.CommonPreview}"/></field>
         <field name="colorWatermark" title="${uiLabelMap.ImageManagementTextColor}" widget-area-style="txt_color">
             <drop-down allow-empty="true" no-current-selected-key="TEXT_BLACK">
-                <entity-options description="${description}" entity-name="ProductFeature" key-field-name="productFeatureId">
+                <entity-options entity-name="ProductFeature" key-field-name="productFeatureId">
                     <entity-constraint name="productFeatureTypeId" value="COLOR"/>
                     <entity-constraint name="productFeatureCategoryId" value="TEXT"/>
                     <entity-order-by field-name="defaultSequenceNum"/>
@@ -479,7 +479,7 @@ under the License.
         </field>
         <field name="sizeWatermark" title="${uiLabelMap.ImageManagementTextSize}" widget-area-style="txt_size">
             <drop-down allow-empty="true" no-current-selected-key="TEXT_MIDDLE">
-                <entity-options description="${description}" entity-name="ProductFeature" key-field-name="productFeatureId">
+                <entity-options entity-name="ProductFeature" key-field-name="productFeatureId">
                     <entity-constraint name="productFeatureTypeId" value="SIZE"/>
                     <entity-constraint name="productFeatureCategoryId" value="TEXT"/>
                     <entity-order-by field-name="defaultSequenceNum"/>
@@ -668,7 +668,7 @@ under the License.
         <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"><display/></field>
         <field name="fromDate"><display/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
             <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
@@ -716,7 +716,7 @@ under the License.
         <field name="contentId"><display/></field>
         <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"><display/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="purchaseFromDate" title="${uiLabelMap.ImageManagementApprovedDate}"><display/></field>
         <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
@@ -758,7 +758,7 @@ under the License.
         </field>
         <field name="fromDate"><display/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
             <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
@@ -801,7 +801,7 @@ under the License.
         </field>
         <field name="fromDate"><display/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="viewButton" title="${uiLabelMap.CommonView}" widget-style="buttontext">
             <hyperlink target="${origContentDataResourceViews[0].drObjectInfo}" target-window="_blank" description="${uiLabelMap.CommonView}" also-hidden="false" target-type="content"/>
diff --git a/applications/product/widget/catalog/PriceForms.xml b/applications/product/widget/catalog/PriceForms.xml
index 4671f535cc8..15c74b61aa8 100644
--- a/applications/product/widget/catalog/PriceForms.xml
+++ b/applications/product/widget/catalog/PriceForms.xml
@@ -80,14 +80,14 @@
         <field name="productPriceCondSeqId"><hidden/></field><!-- Users don't need this information there, the screen is already sufficiently complex! -->
         <field name="inputParamEnumId" title="${uiLabelMap.ProductInput}">
             <drop-down allow-empty="false" current="selected">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="PROD_PRICE_IN_PARAM"/>
                 </entity-options>
             </drop-down>
         </field>        
         <field name="operatorEnumId" title="${uiLabelMap.ProductOperator}">
             <drop-down allow-empty="false" current="selected">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="PROD_PRICE_COND"/>
                 </entity-options>
             </drop-down>
@@ -112,14 +112,14 @@
         <field name="new" title="${uiLabelMap.CommonNew}"><display default-value="${uiLabelMap.ProductPriceRulesNewCond}"/></field>
         <field name="inputParamEnumId" title="${uiLabelMap.ProductInput}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="PROD_PRICE_IN_PARAM"/>
                 </entity-options>
             </drop-down>
         </field>        
         <field name="operatorEnumId" title="${uiLabelMap.ProductOperator}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="PROD_PRICE_COND"/>
                 </entity-options>
             </drop-down>
@@ -138,7 +138,7 @@
         <field name="productPriceActionSeqId"><hidden/></field><!-- Users don't need this information there, the screen is already sufficiently complex! -->
         <field name="productPriceActionTypeId" title="${uiLabelMap.ProductActionType}">
             <drop-down allow-empty="false" current="selected">
-                <entity-options entity-name="ProductPriceActionType" description="${description}" key-field-name="productPriceActionTypeId"/>
+                <entity-options entity-name="ProductPriceActionType" key-field-name="productPriceActionTypeId"/>
             </drop-down>
         </field>        
         <field name="amount" title="${uiLabelMap.ProductValue}"><text/></field>
@@ -156,7 +156,7 @@
         <field name="new" title="${uiLabelMap.CommonNew}"><display default-value="${uiLabelMap.ProductPriceRulesNewAction}"/></field>
         <field name="productPriceActionTypeId" title="${uiLabelMap.ProductActionType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="ProductPriceActionType" description="${description}" key-field-name="productPriceActionTypeId"/>
+                <entity-options entity-name="ProductPriceActionType" key-field-name="productPriceActionTypeId"/>
             </drop-down>
         </field>        
         <field name="amount" title="${uiLabelMap.ProductValue}"><text/></field>
diff --git a/applications/product/widget/catalog/ProdCatalogForms.xml b/applications/product/widget/catalog/ProdCatalogForms.xml
index 63f05171c6a..5290d99b1a5 100644
--- a/applications/product/widget/catalog/ProdCatalogForms.xml
+++ b/applications/product/widget/catalog/ProdCatalogForms.xml
@@ -94,7 +94,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"></lookup></field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRole}">
             <drop-down no-current-selected-key="_NA_">
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -166,7 +166,7 @@ under the License.
         <auto-fields-service service-name="updateProductCategoryToProdCatalog"/>
         <field name="prodCatalogId"><hidden/></field>
         <field name="productCategoryId" title="${uiLabelMap.ProductCategoryId}">
-            <display-entity entity-name="ProductCategory" description="${description}" also-hidden="true" cache="true">
+            <display-entity entity-name="ProductCategory" also-hidden="true" cache="true">
                 <sub-hyperlink link-style="buttontext" target="EditCategory" description="${productCategoryId}">
                     <parameter param-name="productCategoryId"/>
                 </sub-hyperlink>
@@ -200,7 +200,7 @@ under the License.
         <field name="productCategoryId" title="${uiLabelMap.ProductCategoryId}"><lookup target-form-name="LookupProductCategory"></lookup></field>
         <field name="prodCatalogCategoryTypeId" title="${uiLabelMap.ProductCatalogCategoryType}">
             <drop-down>
-                <entity-options entity-name="ProdCatalogCategoryType" description="${description}">
+                <entity-options entity-name="ProdCatalogCategoryType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/product/widget/catalog/ProductForms.xml b/applications/product/widget/catalog/ProductForms.xml
index 6fe1f3528e3..ffdea7816bc 100644
--- a/applications/product/widget/catalog/ProductForms.xml
+++ b/applications/product/widget/catalog/ProductForms.xml
@@ -47,7 +47,7 @@ under the License.
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
-        <field name="productTypeId" sort-field="true"><display-entity entity-name="ProductType" description="${description}"/></field>
+        <field name="productTypeId" sort-field="true"><display-entity entity-name="ProductType"/></field>
         <field name="internalName" sort-field="true"><display/></field>
         <field name="brandName" sort-field="true"><display/></field>
         <field name="productName" sort-field="true"><display/></field>
@@ -68,7 +68,7 @@ under the License.
 
         <field position="2" name="productTypeId" title="${uiLabelMap.ProductProductType}">
             <drop-down no-current-selected-key="FINISHED_GOOD">
-                <entity-options entity-name="ProductType" description="${description}"> <!-- [${productTypeId}] -->
+                <entity-options entity-name="ProductType"> <!-- [${productTypeId}] -->
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -81,7 +81,7 @@ under the License.
         </field>
         <field position="3" name="virtualVariantMethodEnum" title="${uiLabelMap.ProductVirtualVariantMethod}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="PROD_VVMETHOD"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -111,7 +111,7 @@ under the License.
             </field>
         <field position="1" name="requirementMethodEnumId" title="${uiLabelMap.ProductRequirementMethodEnumId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="PROD_REQ_METHOD"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -133,7 +133,7 @@ under the License.
 
         <field position="1" name="ratingTypeEnum" title="${uiLabelMap.ProductRatingTypeEnum}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="PROD_RATING_TYPE"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -146,7 +146,7 @@ under the License.
         </field>
         <field position="2" name="amountUomTypeId" title="${uiLabelMap.ProductAmountUomTypeId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="UomType" key-field-name="uomTypeId" description="${description}">
+                <entity-options entity-name="UomType" key-field-name="uomTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -220,7 +220,7 @@ under the License.
         </field>
         <field position="3" name="defaultShipmentBoxTypeId" title="${uiLabelMap.ProductDefaultShipmentBoxTypeId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ShipmentBoxType" key-field-name="shipmentBoxTypeId" description="${description}">
+                <entity-options entity-name="ShipmentBoxType" key-field-name="shipmentBoxTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -402,14 +402,14 @@ under the License.
         <field name="productId"><hidden/></field>
         <field name="productPriceTypeId" title="${uiLabelMap.ProductPriceType}">
             <drop-down allow-empty="false" no-current-selected-key="DEFAULT_PRICE">
-                <entity-options entity-name="ProductPriceType" description="${description}">
+                <entity-options entity-name="ProductPriceType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="productPricePurposeId" title="${uiLabelMap.CommonPurpose}">
             <drop-down allow-empty="false" no-current-selected-key="PURCHASE">
-                <entity-options entity-name="ProductPricePurpose" description="${description}">
+                <entity-options entity-name="ProductPricePurpose">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -440,7 +440,7 @@ under the License.
         </field>
         <field name="customPriceCalcService">
             <drop-down allow-empty="true">
-                <entity-options entity-name="CustomMethod" key-field-name="customMethodId" description="${description}">
+                <entity-options entity-name="CustomMethod" key-field-name="customMethodId">
                     <entity-constraint name="customMethodTypeId" operator="equals" value="PRICE_FORMULA"/>
                 </entity-options>
             </drop-down>
@@ -468,7 +468,7 @@ under the License.
         </field>
         <field name="customPriceCalcService">
             <drop-down allow-empty="true">
-                <entity-options entity-name="CustomMethod" key-field-name="customMethodId" description="${description}">
+                <entity-options entity-name="CustomMethod" key-field-name="customMethodId">
                     <entity-constraint name="customMethodTypeId" operator="equals" value="PRICE_FORMULA"/>
                 </entity-options>
             </drop-down>
@@ -503,14 +503,14 @@ under the License.
         <field name="productId"><hidden/></field>
         <field name="productPricePurposeId" title="${uiLabelMap.CommonPurpose}" widget-style="smallSelect">
             <drop-down allow-empty="false">
-                <entity-options entity-name="ProductPricePurpose" description="${description}">
+                <entity-options entity-name="ProductPricePurpose">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="paymentMethodTypeId" widget-style="smallSelect">
             <drop-down allow-empty="false">
-                <entity-options entity-name="PaymentMethodType" description="${description}">
+                <entity-options entity-name="PaymentMethodType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -580,7 +580,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="productContentTypeId" title="${uiLabelMap.ProductType}">
-            <display-entity entity-name="ProductContentType" also-hidden="false" description="${description}"/>
+            <display-entity entity-name="ProductContentType" also-hidden="false"/>
         </field>
         <field name="fromDate"><display/></field>
         <field name="thruDate"><display/></field>
@@ -610,7 +610,7 @@ under the License.
         <field name="contentId" title="${uiLabelMap.ProductContentId}"><lookup target-form-name="LookupContent"/></field>
         <field name="productContentTypeId" title="${uiLabelMap.ProductProductContentTypeId}">
             <drop-down>
-                <entity-options entity-name="ProductContentType" description="${description}">
+                <entity-options entity-name="ProductContentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -623,7 +623,7 @@ under the License.
         <field name="useTime" title="${uiLabelMap.ProductUseTime}"></field>
         <field name="useTimeUomId" title="${uiLabelMap.ProductUseTimeUom}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${description}">
+                <entity-options entity-name="Uom" key-field-name="uomId">
                     <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -631,7 +631,7 @@ under the License.
         </field>
         <field name="useRoleTypeId" title="${uiLabelMap.ProductUseRole}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" key-field-name="roleTypeId" description="${description}">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -643,7 +643,7 @@ under the License.
         <field name="productId" map-name="product"><hidden/></field>
         <field name="productContentTypeId" title="${uiLabelMap.ProductProductContentTypeId}">
             <drop-down>
-                <entity-options entity-name="ProductContentType" description="${description}">
+                <entity-options entity-name="ProductContentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -664,7 +664,7 @@ under the License.
         </field>
         <field name="productContentTypeId" title="${uiLabelMap.ProductProductContentTypeId}">
             <drop-down>
-                <entity-options entity-name="ProductContentType" description="${description}">
+                <entity-options entity-name="ProductContentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -687,14 +687,14 @@ under the License.
             </entity-and>
         </actions>
         <field name="caContentAssocTypeId">
-            <display-entity entity-name="ContentAssocType" key-field-name="contentAssocTypeId" also-hidden="false" description="${description}"/>
+            <display-entity entity-name="ContentAssocType" key-field-name="contentAssocTypeId" also-hidden="false"/>
         </field>
         <field name="contentTypeId">
-            <display-entity entity-name="ContentType" also-hidden="false" description="${description}"/>
+            <display-entity entity-name="ContentType" also-hidden="false"/>
         </field>
         <field name="localeString"><display/></field>
         <field name="drDataResourceTypeId" title="${uiLabelMap.FormFieldTitle_dataResourceTypeId}">
-            <display-entity entity-name="DataResourceType" key-field-name="dataResourceTypeId" also-hidden="false" description="${description}"/>
+            <display-entity entity-name="DataResourceType" key-field-name="dataResourceTypeId" also-hidden="false"/>
         </field>
         <field name="editDataResource" widget-style="buttontext">
             <hyperlink target="/content/control/EditDataResource" target-type="inter-app" description="${dataResourceId}" also-hidden="false">
@@ -727,7 +727,7 @@ under the License.
         <field name="useTime" title="${uiLabelMap.ProductUseTime}"></field>
         <field name="useTimeUomId" title="${uiLabelMap.ProductUseTimeUom}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${description}">
+                <entity-options entity-name="Uom" key-field-name="uomId">
                     <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -759,7 +759,7 @@ under the License.
         <field name="useTime" title="${uiLabelMap.ProductUseTime}"></field>
         <field name="useTimeUomId" title="${uiLabelMap.ProductUseTimeUom}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${description}">
+                <entity-options entity-name="Uom" key-field-name="uomId">
                     <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -895,14 +895,14 @@ under the License.
         </field>
         <field name="supplierPrefOrderId">
             <drop-down allow-empty="true" no-current-selected-key="10_MAIN_SUPPL">
-                <entity-options entity-name="SupplierPrefOrder" key-field-name="supplierPrefOrderId" description="${description}">
+                <entity-options entity-name="SupplierPrefOrder" key-field-name="supplierPrefOrderId">
                     <entity-order-by field-name="supplierPrefOrderId"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="supplierRatingTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="SupplierRatingType" key-field-name="supplierRatingTypeId" description="${description}">
+                <entity-options entity-name="SupplierRatingType" key-field-name="supplierRatingTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1074,7 +1074,7 @@ under the License.
         <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" ><lookup target-form-name="LookupFixedAsset"/></field>
         <field name="fixedAssetProductTypeId" title="${uiLabelMap.AccountingFixedAssetProductType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="FixedAssetProductType" description="${description}">
+                <entity-options entity-name="FixedAssetProductType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1089,7 +1089,7 @@ under the License.
         <field name="quantity" title="${uiLabelMap.CommonQuantity}"><text maxlength="5" size="5"/></field>
         <field name="quantityUomId" title="${uiLabelMap.CommonUom}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${description}">
+                <entity-options entity-name="Uom" key-field-name="uomId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1113,7 +1113,7 @@ under the License.
         <field use-when="fixedAssetId!=null" name="fixedAssetProductTypeId" title="${uiLabelMap.AccountingFixedAssetProductType}"><display-entity entity-name="FixedAssetProductType"/></field>
         <field use-when="fixedAssetId==null" name="fixedAssetProductTypeId" title="${uiLabelMap.AccountingFixedAssetProductType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="FixedAssetProductType" description="${description}">
+                <entity-options entity-name="FixedAssetProductType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1128,7 +1128,7 @@ under the License.
         <field name="quantity" title="${uiLabelMap.CommonQuantity}"><text maxlength="5" size="5"/></field>
         <field name="quantityUomId" title="${uiLabelMap.CommonUom}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${description}">
+                <entity-options entity-name="Uom" key-field-name="uomId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1294,14 +1294,14 @@ under the License.
         <field name="productId"><hidden value="${product.productId}"/></field>
         <field name="costComponentTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="CostComponentType" description="${description}">
+                <entity-options entity-name="CostComponentType">
                     <entity-constraint name="parentTypeId" operator="equals" env-name="nullField"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="costComponentCalcId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="CostComponentCalc" description="${description}"/>
+                <entity-options entity-name="CostComponentCalc"/>
             </drop-down>
         </field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field>
@@ -1322,7 +1322,7 @@ under the License.
         <field name="costComponentCalcId"><lookup target-form-name="LookupCostComponentCalc"/></field>
         <field name="costComponentTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="CostComponentType" description="${description}">
+                <entity-options entity-name="CostComponentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1384,7 +1384,7 @@ under the License.
         <field name="productMaintSeqId"><ignored/></field>
         <field name="productMaintTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="ProductMaintType" description="${description}">
+                <entity-options entity-name="ProductMaintType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1392,14 +1392,14 @@ under the License.
         <field name="maintTemplateWorkEffortId"><lookup target-form-name="LookupWorkEffort"/></field>
         <field name="intervalUomId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Uom" description="${description}" key-field-name="uomId">
+                <entity-options entity-name="Uom" key-field-name="uomId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="intervalMeterTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ProductMeterType" description="${description}" key-field-name="productMeterTypeId">
+                <entity-options entity-name="ProductMeterType" key-field-name="productMeterTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1418,7 +1418,7 @@ under the License.
         <field name="productMaintSeqId"><hidden/></field>
         <field name="productMaintTypeId">
             <drop-down allow-empty="true" >
-                <entity-options description="${description}" entity-name="ProductMaintType">
+                <entity-options entity-name="ProductMaintType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1427,7 +1427,7 @@ under the License.
         <field name="maintTemplateWorkEffortId"><lookup  target-form-name="LookupWorkEffort"/></field>
         <field name="intervalUomId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="Uom" description="${description}" key-field-name="uomId">
+                <entity-options entity-name="Uom" key-field-name="uomId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1435,7 +1435,7 @@ under the License.
         </field>
         <field name="intervalMeterTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ProductMeterType" key-field-name="productMeterTypeId">
+                <entity-options entity-name="ProductMeterType" key-field-name="productMeterTypeId">
                     <entity-order-by field-name="productMeterTypeId"/>
                 </entity-options>
             </drop-down>
@@ -1455,14 +1455,14 @@ under the License.
         <field name="productId"><hidden/></field>
         <field name="productMeterTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="ProductMeterType" description="${description}">
+                <entity-options entity-name="ProductMeterType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="meterUomId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="Uom" description="${description}" key-field-name="uomId">
+                <entity-options entity-name="Uom" key-field-name="uomId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1484,7 +1484,7 @@ under the License.
         </field>
         <field name="meterUomId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="Uom" description="${description}" key-field-name="uomId">
+                <entity-options entity-name="Uom" key-field-name="uomId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1513,7 +1513,7 @@ under the License.
         </field>
         <field name="productGeoEnumId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="PROD_GEO"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -1534,7 +1534,7 @@ under the License.
         <field name="geoId"><display also-hidden="true"/></field>
         <field name="productGeoEnumId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="PROD_GEO"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -1552,14 +1552,14 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table">
         <field name="productId"><hidden/></field>
         <field name="productFeatureId">
-            <display-entity entity-name="ProductFeature" description="${description}">
+            <display-entity entity-name="ProductFeature">
                 <sub-hyperlink target="EditFeature" description="[${productFeatureId}]">
                     <parameter param-name="productFeatureId"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="productFeatureIdTo">
-            <display-entity entity-name="ProductFeature" description="${description}" key-field-name="productFeatureId">
+            <display-entity entity-name="ProductFeature" key-field-name="productFeatureId">
                 <sub-hyperlink target="EditFeature" description="[${productFeatureIdTo}]">
                     <parameter param-name="productFeatureId" from-field="productFeatureIdTo"/>
                 </sub-hyperlink>
@@ -1596,7 +1596,7 @@ under the License.
         </field>
         <field name="productFeatureIactnTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="ProductFeatureIactnType">
+                <entity-options entity-name="ProductFeatureIactnType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1651,7 +1651,7 @@ under the License.
 
         <field name="productId"><hidden/></field>
         <field name="subscriptionResourceId">
-            <display-entity entity-name="SubscriptionResource" description="${description}">
+            <display-entity entity-name="SubscriptionResource">
                 <sub-hyperlink target="EditSubscriptionResource" description="${subscriptionResourceId}" link-style="buttontext">
                     <parameter param-name="subscriptionResourceId"/>
                 </sub-hyperlink>
@@ -1669,7 +1669,7 @@ under the License.
         </field>
         <field name="useRoleTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1697,7 +1697,7 @@ under the License.
         <field name="productId"><hidden/></field>
         <field name="subscriptionResourceId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="SubscriptionResource" description="${description}">
+                <entity-options entity-name="SubscriptionResource">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1713,7 +1713,7 @@ under the License.
         </field>
         <field name="useRoleTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1793,7 +1793,7 @@ under the License.
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="WEFG_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -1801,7 +1801,7 @@ under the License.
         </field>
         <field name="workEffortGoodStdTypeId">
             <drop-down no-current-selected-key="">
-                <entity-options entity-name="WorkEffortGoodStandardType" description="${description}" key-field-name="workEffortGoodStdTypeId">
+                <entity-options entity-name="WorkEffortGoodStandardType" key-field-name="workEffortGoodStdTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1823,12 +1823,12 @@ under the License.
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="workEffortGoodStdTypeId"><display-entity entity-name="WorkEffortGoodStandardType" description="${description}"/></field>
+        <field name="workEffortGoodStdTypeId"><display-entity entity-name="WorkEffortGoodStandardType"/></field>
         <field name="productId"><hidden/></field>
         <field name="fromDate"><display/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="WEFG_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -1923,7 +1923,7 @@ under the License.
         <field name="productId"><hidden/></field>
         <field name="goodIdentificationTypeId" title="${uiLabelMap.ProductIdType}">
             <drop-down allow-empty="false" no-current-selected-key="ISBN">
-                <entity-options entity-name="GoodIdentificationType" description="${description}">
+                <entity-options entity-name="GoodIdentificationType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1951,7 +1951,7 @@ under the License.
         <field name="relevancyWeight"><text default-value="1"/></field>
         <field name="keywordTypeId">
             <drop-down>
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="KEYWORD_TYPE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -1959,7 +1959,7 @@ under the License.
         </field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="KEYWORD_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -1983,12 +1983,12 @@ under the License.
         <field name="productId"><hidden/></field>
         <field name="keyword"><display/></field>
         <field name="keywordTypeId" title="${uiLabelMap.FormFieldTitle_keywordType}">
-            <display-entity entity-name="Enumeration" description="${description}" key-field-name="enumId"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
         <field name="relevancyWeight"><display/></field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="KEYWORD_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -2036,7 +2036,7 @@ under the License.
         </row-actions>
         <field name="productId"><hidden/></field>
         <field name="glAccountTypeId" title="${uiLabelMap.ProductAccountType}">
-            <display-entity entity-name="GlAccountType" key-field-name="glAccountTypeId" description="${description}"/>
+            <display-entity entity-name="GlAccountType" key-field-name="glAccountTypeId"/>
         </field>
         <field name="organizationPartyId" title="${uiLabelMap.ProductOrganization}">
             <display description="${groovy: org.ofbiz.party.party.PartyHelper.getPartyName(delegator, organizationPartyId, true);} [${organizationPartyId}]"/>
@@ -2058,7 +2058,7 @@ under the License.
         <field name="productId"><hidden/></field>
         <field name="glAccountTypeId" title="${uiLabelMap.ProductAccountType}">
             <drop-down allow-empty="false">
-                <list-options key-name="glAccountTypeId" list-name="productGlAccountTypes" description="${description}"/>
+                <list-options key-name="glAccountTypeId" list-name="productGlAccountTypes"/>
             </drop-down>
         </field>
         <field name="organizationPartyId" title="${uiLabelMap.ProductOrganization}">
@@ -2093,7 +2093,7 @@ under the License.
         <field name="vendorPartyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="productStoreGroupId">
             <drop-down current="selected" allow-empty="false">
-                <entity-options entity-name="ProductStoreGroup" key-field-name="productStoreGroupId" description="${description}"/>
+                <entity-options entity-name="ProductStoreGroup" key-field-name="productStoreGroupId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -2111,10 +2111,10 @@ under the License.
             <hyperlink description="${communicationEventId}" target="/partymgr/control/EditCommunicationEvent?communicationEventId=${communicationEventId}" target-type="inter-app"/>
         </field>
         <field name="subject"><display/></field>
-        <field name="communicationEventTypeId"><display-entity description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/></field>
-        <field name="contactMechTypeId"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
+        <field name="communicationEventTypeId"><display-entity entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/></field>
+        <field name="contactMechTypeId"><display-entity entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="lastUpdatedStampCE" title="Email Sent On"><display/></field>
         <field name="contactMechIdTo" title="To Email Address">
@@ -2164,7 +2164,7 @@ under the License.
         <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -2193,7 +2193,7 @@ under the License.
         <field name="soldOrderQty" title="${uiLabelMap.ProductSoldQuantity}"><display/></field>
         <field name="fromDate" title="${uiLabelMap.ProductDealStartDate}"><display/></field>
         <field name="thruDate" title="${uiLabelMap.ProductDealEndDate}"><display/></field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="editLink" use-when="${groovy: return reqOrderQty.compareTo(soldOrderQty)!= 0;}&amp;&amp;${groovy: return thruDate.compareTo(org.ofbiz.base.util.UtilDateTime.nowTimestamp()) == 1}" title=" " widget-style="buttontext">
             <hyperlink target="EditProductGroupOrder" description="${uiLabelMap.CommonEdit}" also-hidden="false">
                 <parameter param-name="productId"/>
@@ -2251,7 +2251,7 @@ under the License.
         <field name="keyword" title="${uiLabelMap.ProductTag}"><display/></field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="KEYWORD_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
diff --git a/applications/product/widget/catalog/ProductStoreForms.xml b/applications/product/widget/catalog/ProductStoreForms.xml
index 5c5fda2a80b..2dcd27a29c0 100644
--- a/applications/product/widget/catalog/ProductStoreForms.xml
+++ b/applications/product/widget/catalog/ProductStoreForms.xml
@@ -113,7 +113,7 @@
         </field>
         <field name="reserveOrderEnumId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="INV_RES_ORDER"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -130,7 +130,7 @@
         </field>
         <field name="requirementMethodEnumId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="PROD_REQ_METHOD"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -152,7 +152,7 @@
         </field>
         <field name="defaultSalesChannelEnumId">
             <drop-down allow-empty="true">
-                <entity-options key-field-name="enumId" description="${description}" entity-name="Enumeration">
+                <entity-options key-field-name="enumId" entity-name="Enumeration">
                     <entity-constraint name="enumTypeId" operator="equals" value="ORDER_SALES_CHANNEL"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -230,7 +230,7 @@
         </field>
         <field name="storeCreditAccountEnumId">
             <drop-down allow-empty="false">
-                <entity-options key-field-name="enumId" description="${description}" entity-name="Enumeration">
+                <entity-options key-field-name="enumId" entity-name="Enumeration">
                     <entity-constraint name="enumTypeId" operator="equals" value="STR_CRDT_ACT"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -423,10 +423,10 @@
         <auto-fields-service service-name="updateProductStoreFinActSetting" default-field-type="display"/>
         <field name="productStoreId"><ignored/></field>
         <field name="finAccountTypeId">
-            <display-entity entity-name="FinAccountType" description="${description}" key-field-name="finAccountTypeId"/>
+            <display-entity entity-name="FinAccountType" key-field-name="finAccountTypeId"/>
         </field>
         <field name="replenishMethodEnumId">
-            <display-entity entity-name="Enumeration" description="${description}" key-field-name="enumId"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
         <field name="remove" title=" " widget-style="buttontext">
             <hyperlink target="RemoveProductStoreFinAccountSettings" description="${uiLabelMap.CommonRemove}">
@@ -448,17 +448,17 @@
 
         <field name="productStoreId"><hidden/></field>
         <field name="finAccountTypeId" use-when="finAccountSetting!=null">
-            <display-entity entity-name="FinAccountType" also-hidden="true" description="${description}" key-field-name="finAccountTypeId"/>
+            <display-entity entity-name="FinAccountType" also-hidden="true" key-field-name="finAccountTypeId"/>
         </field>
         <field name="finAccountTypeId" use-when="finAccountSetting==null">
             <drop-down allow-empty="false">
-                <entity-options entity-name="FinAccountType" description="${description}" key-field-name="finAccountTypeId"/>
+                <entity-options entity-name="FinAccountType" key-field-name="finAccountTypeId"/>
             </drop-down>
         </field>
 
         <field name="replenishMethodEnumId">
             <drop-down allow-empty="false" no-current-selected-key="FARP_TOP_OFF">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="FARP_METHOD"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -511,7 +511,7 @@
         <field name="productStoreId" map-name="productStore"><hidden/></field>
         <field name="emailType" title="${uiLabelMap.CommonEmailType}">
             <drop-down>
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="in" value="PRDS_EMAIL,PARTY_EMAIL"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -528,7 +528,7 @@
         <auto-fields-service service-name="updateProductStoreEmailSetting"/>
         <field name="productStoreId"><hidden/></field>
         <field name="emailType" title="${uiLabelMap.CommonEmailType}">
-            <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}" cache="true" also-hidden="true"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId" cache="true" also-hidden="true"/>
         </field>
         <field name="bodyScreenLocation" title="${uiLabelMap.ProductBodyScreenLocation}"></field>
         <field name="xslfoAttachScreenLocation" title="${uiLabelMap.ProductAttachmentScreenLocation}"></field>
@@ -549,7 +549,7 @@
         <field name="productStoreId" map-name="productStore"><hidden/></field>
         <field name="targetTypeEnumId" title="${uiLabelMap.ProductTargetTypeEnumId}">
             <drop-down>
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="KWOVRD_TRGT_TYPE"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -565,7 +565,7 @@
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display description="${fromDate}"/></field>
         <field name="targetTypeEnumId" title="${uiLabelMap.ProductTargetType}">
             <drop-down>
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="KWOVRD_TRGT_TYPE"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -611,7 +611,7 @@
             </hyperlink>
         </field>
         <field name="shipmentMethodTypeId" title="${uiLabelMap.ProductMethod}">
-            <display-entity entity-name="ShipmentMethodType" description="${description}" cache="true" also-hidden="true"/>
+            <display-entity entity-name="ShipmentMethodType" cache="true" also-hidden="true"/>
         </field>
         <field name="roleTypeId"><hidden/></field>
         <field name="includeGeoId">
@@ -630,7 +630,7 @@
             <display-entity entity-name="CustomMethod" key-field-name="customMethodId" description="${description} (${customMethodName})"/>
         </field>
         <field name="shipmentGatewayConfigId" title="${uiLabelMap.FacilityShipmentGatewayConfigId}">
-            <display-entity entity-name="ShipmentGatewayConfig" key-field-name="shipmentGatewayConfigId"  description="${description}"/>
+            <display-entity entity-name="ShipmentGatewayConfig" key-field-name="shipmentGatewayConfigId" />
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
             <hyperlink target="storeRemoveShipMeth" description="${uiLabelMap.CommonRemove}" also-hidden="false">
@@ -646,7 +646,7 @@
         <field name="productStoreId"><hidden/></field>
         <field name="productStoreShipMethId" use-when="productStoreShipmentMeth!=null"><display/></field>
         <field name="shipmentMethodTypeId">
-            <display-entity entity-name="ShipmentMethodType" description="${description}" cache="true" also-hidden="true"/>
+            <display-entity entity-name="ShipmentMethodType" cache="true" also-hidden="true"/>
         </field>
         <field name="roleTypeId"><display/></field>
         <field name="partyId"><display/></field>
@@ -695,7 +695,7 @@
         </field>
         <field name="shipmentGatewayConfigId" title="${uiLabelMap.FacilityShipmentGatewayConfigId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ShipmentGatewayConfig" key-field-name="shipmentGatewayConfigId" description="${description}">
+                <entity-options entity-name="ShipmentGatewayConfig" key-field-name="shipmentGatewayConfigId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -717,7 +717,7 @@
             </hyperlink>
         </field>
         <field name="shipmentMethodTypeId" title="${uiLabelMap.ProductMethod}">
-            <display-entity entity-name="ShipmentMethodType" description="${description}" cache="true" also-hidden="true"/>
+            <display-entity entity-name="ShipmentMethodType" cache="true" also-hidden="true"/>
         </field>
         <field name="geoIdFrom" title="${uiLabelMap.ProductFromGeo}">
             <display-entity entity-name="Geo" key-field-name="geoId" description="${geoName} [${geoId}]"/>
@@ -729,19 +729,19 @@
             <display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity} [${quantityBreakId}]"/>
         </field>
         <field name="weightUomId" title="${uiLabelMap.ProductUnitOfMeasure}">
-            <display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/>
+            <display-entity entity-name="Uom" key-field-name="uomId"/>
         </field>
         <field name="quantityBreakId">
             <display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity} [${quantityBreakId}]"/>
         </field>
         <field name="quantityUomId" title="${uiLabelMap.ProductUnitOfMeasure}">
-            <display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/>
+            <display-entity entity-name="Uom" key-field-name="uomId"/>
         </field>
         <field name="priceBreakId">
             <display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity} [${quantityBreakId}]"/>
         </field>
         <field name="priceUomId" title="${uiLabelMap.ProductUnitOfMeasure}">
-            <display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/>
+            <display-entity entity-name="Uom" key-field-name="uomId"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
             <hyperlink target="storeRemoveShipRate" description="${uiLabelMap.CommonRemove}" also-hidden="false">
@@ -796,7 +796,7 @@
 
         <field name="wuom" title="${uiLabelMap.ProductUnitOfMeasure}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${description}">
+                <entity-options entity-name="Uom" key-field-name="uomId">
                     <entity-constraint name="uomTypeId" value="WEIGHT_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -817,7 +817,7 @@
         </field>
         <field name="quom" title="${uiLabelMap.ProductUnitOfMeasure}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${description}">
+                <entity-options entity-name="Uom" key-field-name="uomId">
                     <entity-constraint name="uomTypeId" operator="not-equals" value="CURRENCY_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -934,7 +934,7 @@
             <display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity}"/>
         </field>
         <field name="weightUomId" title="${uiLabelMap.ProductUnitOfMeasure}">
-            <display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/>
+            <display-entity entity-name="Uom" key-field-name="uomId"/>
         </field>
         <field name="weightUnitPrice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><display/></field>
 
@@ -944,7 +944,7 @@
             <display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity}"/>
         </field>
         <field name="quantityUomId" title="${uiLabelMap.ProductUnitOfMeasure}">
-            <display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/>
+            <display-entity entity-name="Uom" key-field-name="uomId"/>
         </field>
         <field name="quantityUnitPrice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><display/></field>
 
@@ -954,7 +954,7 @@
             <display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity}"/>
         </field>
         <field name="priceUomId" title="${uiLabelMap.ProductUnitOfMeasure}">
-            <display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/>
+            <display-entity entity-name="Uom" key-field-name="uomId"/>
         </field>
         <field name="priceUnitPrice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><display/></field>
     </form>
@@ -963,10 +963,10 @@
         <field name="productStoreId"><hidden/></field>
         <field name="vendorPartyId"><display/></field>
         <field name="paymentMethodTypeId">
-            <display-entity entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId" description="${description}"/>
+            <display-entity entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId"/>
         </field>
         <field name="creditCardEnumId">
-            <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
@@ -976,7 +976,7 @@
         <field name="vendorPartyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="paymentMethodTypeId">
             <drop-down current="selected" allow-empty="false">
-                <entity-options entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId" description="${description}"/>
+                <entity-options entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId"/>
             </drop-down>
         </field>
         <field name="creditCardEnumId">
@@ -994,7 +994,7 @@
         <field name="carrierPartyId"><display/></field>
         <field name="vendorPartyId"><display/></field>
         <field name="shipmentMethodTypeId">
-            <display-entity entity-name="ShipmentMethodType" key-field-name="shipmentMethodTypeId" description="${description}"/>
+            <display-entity entity-name="ShipmentMethodType" key-field-name="shipmentMethodTypeId"/>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
@@ -1005,7 +1005,7 @@
         <field name="vendorPartyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="shipmentMethodTypeId">
             <drop-down current="selected" allow-empty="false">
-                <entity-options entity-name="ShipmentMethodType" key-field-name="shipmentMethodTypeId" description="${description}"/>
+                <entity-options entity-name="ShipmentMethodType" key-field-name="shipmentMethodTypeId"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -1060,17 +1060,17 @@
         </actions>
         <field name="productStoreId"><hidden/></field>
         <field name="paymentMethodTypeId" title="${uiLabelMap.CommonPaymentMethodType}">
-            <display-entity entity-name="PaymentMethodType" description="${description}"/>
+            <display-entity entity-name="PaymentMethodType"/>
         </field>
         <field name="paymentServiceTypeEnumId" title="${uiLabelMap.ProductServiceType}">
-            <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
         <field name="paymentService" title="${uiLabelMap.ProductServiceName}"><display/></field>
         <field name="paymentCustomMethodId" title="${uiLabelMap.ProductCustomMethod}">
             <display-entity entity-name="CustomMethod" key-field-name="customMethodId" description="${description} (${customMethodName})"/>
         </field>
         <field name="paymentGatewayConfigId" title="${uiLabelMap.AccountingPaymentGatewayConfigId}">
-            <display-entity entity-name="PaymentGatewayConfig" key-field-name="paymentGatewayConfigId"  description="${description}"/>
+            <display-entity entity-name="PaymentGatewayConfig" key-field-name="paymentGatewayConfigId" />
         </field>
         <field name="paymentPropertiesPath" title="${uiLabelMap.ProductPaymentProps}"><display/></field>
         <field name="applyToAllProducts" title="${uiLabelMap.ProductApplyToAll}"><display/></field>
@@ -1101,21 +1101,21 @@
         <alt-target use-when="productStorePaymentSetting==null" target="storeCreatePaySetting"/>
         <field name="productStoreId"><hidden/></field>
         <field name="paymentMethodTypeId" title="${uiLabelMap.CommonPaymentMethodType}" use-when="productStorePaymentSetting!=null">
-            <display-entity entity-name="PaymentMethodType" also-hidden="true" description="${description}" key-field-name="paymentMethodTypeId"/>
+            <display-entity entity-name="PaymentMethodType" also-hidden="true" key-field-name="paymentMethodTypeId"/>
         </field>
         <field name="paymentMethodTypeId" title="${uiLabelMap.CommonPaymentMethodType}" use-when="productStorePaymentSetting==null">
             <drop-down allow-empty="false">
-                <entity-options entity-name="PaymentMethodType" description="${description}">
+                <entity-options entity-name="PaymentMethodType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="paymentServiceTypeEnumId" title="${uiLabelMap.ProductServiceType}" use-when="productStorePaymentSetting!=null">
-            <display-entity entity-name="Enumeration" also-hidden="true" description="${description}" key-field-name="enumId"/>
+            <display-entity entity-name="Enumeration" also-hidden="true" key-field-name="enumId"/>
         </field>
         <field name="paymentServiceTypeEnumId" title="${uiLabelMap.ProductServiceType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="PRDS_PAYSVC"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -1129,7 +1129,7 @@
         </field>
         <field name="paymentGatewayConfigId" title="${uiLabelMap.AccountingPaymentGatewayConfigId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="PaymentGatewayConfig" key-field-name="paymentGatewayConfigId" description="${description}">
+                <entity-options entity-name="PaymentGatewayConfig" key-field-name="paymentGatewayConfigId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/product/widget/catalog/PromoForms.xml b/applications/product/widget/catalog/PromoForms.xml
index 0d4785469ca..e79b3b0191e 100644
--- a/applications/product/widget/catalog/PromoForms.xml
+++ b/applications/product/widget/catalog/PromoForms.xml
@@ -142,7 +142,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="productPromoContentTypeId" title="${uiLabelMap.ProductProductPromoContentType}">
-            <display-entity entity-name="ProductContentType" key-field-name="productContentTypeId" also-hidden="false" description="${description}"/>
+            <display-entity entity-name="ProductContentType" key-field-name="productContentTypeId" also-hidden="false"/>
         </field>
         <field name="fromDate"><display/></field>
         <field name="thruDate"><display/></field>
diff --git a/applications/product/widget/catalog/ReviewForms.xml b/applications/product/widget/catalog/ReviewForms.xml
index f4c88204ddb..c62a9b09018 100644
--- a/applications/product/widget/catalog/ReviewForms.xml
+++ b/applications/product/widget/catalog/ReviewForms.xml
@@ -26,7 +26,7 @@ under the License.
         <field name="productId" title="${uiLabelMap.ProductId}"><text-find/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="PRODUCT_REVIEW_STTS"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/product/widget/catalog/ShippingForms.xml b/applications/product/widget/catalog/ShippingForms.xml
index f182df4c407..60dee5b876d 100644
--- a/applications/product/widget/catalog/ShippingForms.xml
+++ b/applications/product/widget/catalog/ShippingForms.xml
@@ -43,7 +43,7 @@
         <field name="quantityBreakId"><hidden/></field>
         <field name="quantityBreakTypeId" title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="QuantityBreakType" description="${description}">
+                <entity-options entity-name="QuantityBreakType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -110,7 +110,7 @@
         <field name="roleTypeId" use-when="carrierShipmentMethod!=null"><display/></field>
         <field name="roleTypeId" use-when="carrierShipmentMethod==null">
             <drop-down allow-empty="false" no-current-selected-key="CARRIER">
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/product/widget/catalog/StoreForms.xml b/applications/product/widget/catalog/StoreForms.xml
index 4d006c4d186..7e2fb5b30e2 100644
--- a/applications/product/widget/catalog/StoreForms.xml
+++ b/applications/product/widget/catalog/StoreForms.xml
@@ -27,7 +27,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId"/>
             </drop-down>
         </field>
         <field name="fromDate" position="1"><date-time/></field>
@@ -84,7 +84,7 @@ under the License.
         <field name="productStoreId"><hidden/></field>
         <field name="roleTypeId" use-when="productStoreRole==null" title="${uiLabelMap.PartyRoleTypeId}" tooltip="${uiLabelMap.CommonRequired}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId"/>
             </drop-down>
         </field>
         <field name="roleTypeId" use-when="productStoreRole!=null" title="${uiLabelMap.PartyRoleTypeId}"><display-entity entity-name="RoleType"/></field>
@@ -179,7 +179,7 @@ under the License.
         <field name="productStoreGroupId"><hidden/></field>
         <field name="productStoreGroupTypeId">
             <drop-down>
-                <entity-options description="${description}" entity-name="ProductStoreGroupType"/>
+                <entity-options entity-name="ProductStoreGroupType"/>
             </drop-down>
         </field>
         <field name="primaryParentGroupId" use-when="productStoreGroup == null"><ignored/></field>
diff --git a/applications/product/widget/catalog/SubscriptionForms.xml b/applications/product/widget/catalog/SubscriptionForms.xml
index 40bb7a9929a..a33b894f0d1 100644
--- a/applications/product/widget/catalog/SubscriptionForms.xml
+++ b/applications/product/widget/catalog/SubscriptionForms.xml
@@ -28,14 +28,14 @@ under the License.
 
         <field name="subscriptionResourceId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="SubscriptionResource" description="${description}">
+                <entity-options entity-name="SubscriptionResource">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="subscriptionTypeId" title="${uiLabelMap.ProductSubscriptionType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="SubscriptionType" description="${description}">
+                <entity-options entity-name="SubscriptionType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -44,7 +44,7 @@ under the License.
         <field name="originatedFromPartyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="originatedFromRoleTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -53,7 +53,7 @@ under the License.
         <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -107,14 +107,14 @@ under the License.
         <auto-fields-entity entity-name="Subscription" default-field-type="display"/>
 
         <field name="subscriptionResourceId">
-            <display-entity entity-name="SubscriptionResource" description="${description}">
+            <display-entity entity-name="SubscriptionResource">
                 <sub-hyperlink target="EditSubscriptionResource" description="${subscriptionResourceId}" link-style="buttontext">
                     <parameter param-name="subscriptionResourceId"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="subscriptionTypeId" title="${uiLabelMap.ProductSubscriptionType}">
-            <display-entity entity-name="SubscriptionType" description="${description}"/>
+            <display-entity entity-name="SubscriptionType"/>
         </field>
 
         <field name="originatedFromPartyId">
@@ -124,7 +124,7 @@ under the License.
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="originatedFromRoleTypeId"><display-entity entity-name="RoleType" description="${description}" key-field-name="roleTypeId"/></field>
+        <field name="originatedFromRoleTypeId"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
 
         <field name="partyId">
             <display-entity entity-name="PartyNameView" description="${groupName} ${firstName} ${lastName}">
@@ -133,7 +133,7 @@ under the License.
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}" key-field-name="roleTypeId"/></field>
+        <field name="roleTypeId"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
 
         <field name="orderId" widget-style="buttontext">
             <hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}">
@@ -194,14 +194,14 @@ under the License.
 
         <field name="subscriptionResourceId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="SubscriptionResource" description="${description}">
+                <entity-options entity-name="SubscriptionResource">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="subscriptionTypeId" title="${uiLabelMap.ProductSubscriptionType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="SubscriptionType" description="${description}">
+                <entity-options entity-name="SubscriptionType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -216,7 +216,7 @@ under the License.
         </field>
         <field name="originatedFromRoleTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -231,7 +231,7 @@ under the License.
         </field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -246,7 +246,7 @@ under the License.
         </field>
         <field name="needTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="NeedType" description="${description}">
+                <entity-options entity-name="NeedType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -275,7 +275,7 @@ under the License.
         </field>
         <field name="useTimeUomId" title="${uiLabelMap.ProductUseTimeUom}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${description}">
+                <entity-options entity-name="Uom" key-field-name="uomId">
                     <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -290,7 +290,7 @@ under the License.
         <field name="canclAutmExtTime" title="Cancel time"></field>
         <field name="canclAutmExtTimeUomId" title="Cancel UOM time">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${description}">
+                <entity-options entity-name="Uom" key-field-name="uomId">
                     <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -298,7 +298,7 @@ under the License.
         </field>
         <field name="gracePeriodOnExpiryUomId" title="${uiLabelMap.ProductGracePeriodUomId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${description}">
+                <entity-options entity-name="Uom" key-field-name="uomId">
                     <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -390,7 +390,7 @@ under the License.
         </field>
         <field name="useRoleTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -403,7 +403,7 @@ under the License.
         </field>
         <field name="canclAutmExtTimeUomId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${description}">
+                <entity-options entity-name="Uom" key-field-name="uomId">
                     <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -434,7 +434,7 @@ under the License.
         </field>
         <field name="useRoleTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -447,7 +447,7 @@ under the License.
         </field>
         <field name="canclAutmExtTimeUomId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Uom" key-field-name="uomId" description="${description}">
+                <entity-options entity-name="Uom" key-field-name="uomId">
                     <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -490,11 +490,11 @@ under the License.
         <field name="partyIdTo">
             <display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/>
         </field>
-        <field name="communicationEventTypeId" ><display-entity description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/></field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field>
-        <field name="contactMechTypeId"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
-        <field name="roleTypeIdFrom"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
-        <field name="roleTypeIdTo"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
+        <field name="communicationEventTypeId" ><display-entity entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/></field>
+        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+        <field name="contactMechTypeId"><display-entity entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
+        <field name="roleTypeIdFrom"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
+        <field name="roleTypeIdTo"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
         <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field>
         <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
diff --git a/applications/product/widget/facility/FacilityForms.xml b/applications/product/widget/facility/FacilityForms.xml
index 27c421a0f66..661982acf21 100644
--- a/applications/product/widget/facility/FacilityForms.xml
+++ b/applications/product/widget/facility/FacilityForms.xml
@@ -37,7 +37,7 @@ under the License.
         </field>
         <field name="facilityName"><display/></field>
         <field name="facilityTypeId" title="${uiLabelMap.ProductFacilityType}">
-            <display-entity entity-name="FacilityType" description="${description}"/>
+            <display-entity entity-name="FacilityType"/>
         </field>
         <field name="ownerPartyId" title="${uiLabelMap.ProductFacilityOwner}"><display/></field>
         <field name="FacilitySize" title="${uiLabelMap.ProductFacilitySize}"><display/></field>
@@ -74,10 +74,10 @@ under the License.
         <field name="inventoryItemId"><text-find/></field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="INV_NON_SER_STTS"/>
                 </entity-options>
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="INV_SERIALIZED_STTS"/>
                 </entity-options>
             </drop-down>
@@ -197,7 +197,7 @@ under the License.
         <field name="workEffortId"><text/></field>
         <field name="reasonEnumId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="IID_REASON"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -258,7 +258,7 @@ under the License.
         <field name="availableToPromiseDiff" position="2"><display/></field>
 
         <field name="reasonEnumId" position="2">
-            <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
         <field name="description" position="2"><display/></field>
         <field name="orderId" widget-style="buttontext" position="2">
@@ -314,7 +314,7 @@ under the License.
         <field name="availableToPromiseDiff" position="2"><display/></field>
 
         <field name="reasonEnumId" position="2">
-            <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
         <field name="description" position="2"><display/></field>
         <field name="orderId" widget-style="buttontext" position="2">
@@ -366,7 +366,7 @@ under the License.
         <field name="availableToPromiseDiff"><display/></field>
 
         <field name="reasonEnumId">
-            <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
         <field name="description"><display/></field>
         <field name="orderId" widget-style="buttontext">
@@ -402,7 +402,7 @@ under the License.
         </field>
         <field name="productTypeId" title="${uiLabelMap.ProductProductType}">
             <drop-down allow-empty="true" no-current-selected-key="FINISHED_GOOD">
-                <entity-options entity-name="ProductType" description="${description}"> <!-- [${productTypeId}] -->
+                <entity-options entity-name="ProductType"> <!-- [${productTypeId}] -->
                     <entity-constraint name="isPhysical"  value="Y" operator="equals"/>
                     <entity-constraint name="parentTypeId"  value="GOOD" operator="equals"/>
                     <entity-order-by field-name="description"/>
@@ -420,10 +420,10 @@ under the License.
         </field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="INV_NON_SER_STTS"/>
                 </entity-options>
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="INV_SERIALIZED_STTS"/>
                 </entity-options>
             </drop-down>
@@ -501,14 +501,14 @@ under the License.
         </field>
         <field name="shipmentMethodTypeId" title="${uiLabelMap.ProductShipmentMethodType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="ShipmentMethodType" description="${description}"/>
+                <entity-options entity-name="ShipmentMethodType"/>
             </drop-down>
         </field>
         <field name="billingWeight" title="${uiLabelMap.CommonWeight}"><text size="10"/></field>
         <field name="billingWeightUomId"  title="${uiLabelMap.ProductWeightUomId}">
             <drop-down allow-empty="false">
                 <option key="${defaultWeightUom.uomId}" description="${defaultWeightUom.description}"/>
-                <entity-options entity-name="Uom" description="${description}" key-field-name="uomId">
+                <entity-options entity-name="Uom" key-field-name="uomId">
                     <entity-constraint name="uomTypeId" operator="equals" value="WEIGHT_MEASURE"/>
                 </entity-options>
             </drop-down>
@@ -586,7 +586,7 @@ under the License.
         <field name="productQOH" title="${uiLabelMap.ProductProductQOH}"><display/></field>
         <field name="varianceReasonId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="VarianceReason" description="${description}"/>
+                <entity-options entity-name="VarianceReason"/>
             </drop-down>
         </field>
         <field name="availableToPromiseVar" title="${uiLabelMap.ProductProductATPVar}" event="onchange" action="document.ListPhysicalInventory._rowSubmit_o_${itemIndex}.checked = true"><text size="6"/></field>
@@ -638,7 +638,7 @@ under the License.
             <display-entity description="${groupName} ${firstName} ${lastName} [${partyId}]" entity-name="PartyNameView"/>
         </field>
         <field name="roleTypeId">
-            <display-entity entity-name="RoleType" description="${description}"/>
+            <display-entity entity-name="RoleType"/>
         </field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
@@ -660,7 +660,7 @@ under the License.
         </field>
         <field name="roleTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" description="${description}"/>
+                <entity-options entity-name="RoleType"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
@@ -863,14 +863,14 @@ under the License.
         </field>
         <field name="contentTypeId" title="${uiLabelMap.FormFieldTitle_contentTypeId}">
             <drop-down allow-empty="false" no-current-selected-key="DOCUMENT">
-                <entity-options description="${description}" entity-name="ContentType">
+                <entity-options entity-name="ContentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="false" no-current-selected-key="CTNT_AVAILABLE">
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="CONTENT_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -908,7 +908,7 @@ under the License.
         <field name="geoPointId"><hidden/></field>
         <field name="dataSourceId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="DataSource">
+                <entity-options entity-name="DataSource">
                     <entity-constraint name="dataSourceTypeId" value="GEOPOINT_SUPPLIER"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -919,7 +919,7 @@ under the License.
         <field name="elevation"><text/></field>
         <field name="elevationUomId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="Uom" key-field-name="uomId">
+                <entity-options entity-name="Uom" key-field-name="uomId">
                     <entity-constraint name="uomTypeId" value="LENGTH_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
diff --git a/applications/product/widget/facility/FacilityGroupForms.xml b/applications/product/widget/facility/FacilityGroupForms.xml
index d83cde993d0..bd1ce7e62f5 100644
--- a/applications/product/widget/facility/FacilityGroupForms.xml
+++ b/applications/product/widget/facility/FacilityGroupForms.xml
@@ -40,7 +40,7 @@ under the License.
         <field name="facilityGroupId" use-when="facilityGroup==null"><hidden/></field>
         <field name="facilityGroupTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="FacilityGroupType" key-field-name="facilityGroupTypeId" description="${description}">
+                <entity-options entity-name="FacilityGroupType" key-field-name="facilityGroupTypeId">
                 </entity-options>
             </drop-down>
         </field>
@@ -171,7 +171,7 @@ under the License.
             </display-entity>
         </field>
         <field name="roleTypeId">
-            <display-entity entity-name="RoleType" key-field-name="roleTypeId" description="${description}"/>
+            <display-entity entity-name="RoleType" key-field-name="roleTypeId"/>
         </field>
         <field name="deleteLink" title=" " widget-style="buttontext">
             <hyperlink target="removePartyFromFacilityGroup" description="${uiLabelMap.CommonRemove}" also-hidden="false">
diff --git a/applications/product/widget/facility/FieldLookupForms.xml b/applications/product/widget/facility/FieldLookupForms.xml
index 423142d53b5..1700d03b96f 100644
--- a/applications/product/widget/facility/FieldLookupForms.xml
+++ b/applications/product/widget/facility/FieldLookupForms.xml
@@ -28,7 +28,7 @@ under the License.
         <field name="parentFacilityId"><text-find/></field>
         <field name="facilityTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="FacilityType" key-field-name="facilityTypeId">
+                <entity-options entity-name="FacilityType" key-field-name="facilityTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -65,7 +65,7 @@ under the License.
         </field>
         <field name="locationTypeEnumId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="FACLOC_TYPE"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -91,7 +91,7 @@ under the License.
         </field>
         <field name="facilityId"><hidden/></field>
         <field name="locationTypeEnumId">
-            <display-entity entity-name="Enumeration" description="${description}" key-field-name="enumId"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
     </form>
 
@@ -100,12 +100,12 @@ under the License.
         <field position="1" name="shipmentId"><text-find/></field>
         <field position="1" name="shipmentTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ShipmentType"/>
+                <entity-options entity-name="ShipmentType"/>
             </drop-down>
         </field>
         <field position="2" name="statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="SHIPMENT_STATUS"/>
                 </entity-options>
             </drop-down>
@@ -131,7 +131,7 @@ under the License.
             <hyperlink also-hidden="false" target-type="plain" description="${shipmentId}" target="javascript:set_value('${shipmentId}')"/>
         </field>
         <field name="shipmentTypeId"><display-entity entity-name="ShipmentType"/></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"/></field>
         <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}[${partyId}]"/></field>
         <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}[${partyId}]"/></field>
     </form>
@@ -142,7 +142,7 @@ under the License.
             <hyperlink also-hidden="false" target-type="plain" description="${locationSeqId}" target="javascript:set_value('${locationSeqId}')"/>
         </field> 
         <field name="locationTypeEnumId">
-            <display-entity entity-name="Enumeration" description="${description}" key-field-name="enumId"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
         <field name="quantityOnHandTotal" title="${uiLabelMap.ProductQoh}"><display/></field>
         <field name="availableToPromiseTotal" title="${uiLabelMap.ProductAtp}"><display/></field>
diff --git a/applications/product/widget/facility/InventoryForms.xml b/applications/product/widget/facility/InventoryForms.xml
index 8fc90763548..2cc768e581d 100644
--- a/applications/product/widget/facility/InventoryForms.xml
+++ b/applications/product/widget/facility/InventoryForms.xml
@@ -44,7 +44,7 @@ under the License.
         <field name="inventoryItemId" tooltip="${uiLabelMap.ProductNotModificationRecrationInventoryItem}"><display/></field>
         <field name="inventoryItemTypeId" title="${uiLabelMap.ProductInventoryItemTypeId}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="InventoryItemType" description="${description}" key-field-name="inventoryItemTypeId"/>
+                <entity-options entity-name="InventoryItemType" key-field-name="inventoryItemTypeId"/>
             </drop-down>
         </field>
         <field name="productId" required-field="true" position="1">
@@ -56,24 +56,24 @@ under the License.
         </field>
         <field name="statusId" use-when="inventoryItem==null">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="INV_NON_SER_STTS"/>
                 </entity-options>
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="INV_SERIALIZED_STTS"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="statusId" use-when="inventoryItem!=null&amp;&amp;&quot;SERIALIZED_INV_ITEM&quot;.equals(inventoryItem.getString(&quot;inventoryItemTypeId&quot;))">
             <drop-down allow-empty="false">
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="INV_SERIALIZED_STTS"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="statusId" use-when="inventoryItem!=null&amp;&amp;&quot;NON_SERIAL_INV_ITEM&quot;.equals(inventoryItem.getString(&quot;inventoryItemTypeId&quot;))">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="INV_NON_SER_STTS"/>
                 </entity-options>
             </drop-down>
@@ -160,7 +160,7 @@ under the License.
         <field name="inventoryItemId" map-name="inventoryItem"><hidden/></field>
         <field name="varianceReasonId">
             <drop-down>
-                <entity-options entity-name="VarianceReason" description="${description}">
+                <entity-options entity-name="VarianceReason">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -201,7 +201,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="reasonEnumId">
-            <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
         <!-- workEffortId - not sure if it's better to show manufacturing or workeffort app
         itemIssuanceId, receiptId, physicalInventoryId - no natural screens to show these -->
diff --git a/applications/product/widget/facility/ShipmentForms.xml b/applications/product/widget/facility/ShipmentForms.xml
index 8b4071dc0b8..f59cd5075d2 100644
--- a/applications/product/widget/facility/ShipmentForms.xml
+++ b/applications/product/widget/facility/ShipmentForms.xml
@@ -32,12 +32,12 @@ under the License.
 
         <field name="shipmentTypeId" title="${uiLabelMap.ProductShipmentTypeId}">
             <drop-down allow-empty="false" current="first-in-list">
-                <entity-options entity-name="ShipmentType" description="${description}"/>
+                <entity-options entity-name="ShipmentType"/>
             </drop-down>
         </field>
         <field use-when="shipment==null" name="statusId" title="${uiLabelMap.ProductStatusId}">
             <drop-down allow-empty="false" current="first-in-list">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="${statusItemTypeId}"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
diff --git a/applications/product/widget/facility/ShipmentGatewayConfigForms.xml b/applications/product/widget/facility/ShipmentGatewayConfigForms.xml
index 6427ffdf511..02ca2d32826 100644
--- a/applications/product/widget/facility/ShipmentGatewayConfigForms.xml
+++ b/applications/product/widget/facility/ShipmentGatewayConfigForms.xml
@@ -25,7 +25,7 @@ under the License.
         <field name="description" title="${uiLabelMap.FacilityShipmentGatewayConfigDescription}"><text-find ignore-case="true"/></field>
         <field name="shipmentGatewayConfTypeId" title="${uiLabelMap.FacilityShipmentGatewayConfigTypeId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ShipmentGatewayConfigType" description="${description}" key-field-name="shipmentGatewayConfTypeId">
+                <entity-options entity-name="ShipmentGatewayConfigType" key-field-name="shipmentGatewayConfTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -53,7 +53,7 @@ under the License.
             <hyperlink description="${description}" target="EditShipmentGatewayConfig?shipmentGatewayConfigId=${shipmentGatewayConfigId}"/>
         </field>
         <field name="shipmentGatewayConfTypeId" title="${uiLabelMap.FacilityShipmentGatewayConfigTypeId}">
-            <display-entity entity-name="ShipmentGatewayConfigType" key-field-name="shipmentGatewayConfTypeId" description="${description}"/>
+            <display-entity entity-name="ShipmentGatewayConfigType" key-field-name="shipmentGatewayConfTypeId"/>
         </field>
     </form>
     
@@ -61,7 +61,7 @@ under the License.
         <field name="shipmentGatewayConfigId"><hidden/></field>
         <field name="description" title="${uiLabelMap.FacilityShipmentGatewayConfigDescription}"><text size="60" maxlength="60"/></field>
         <field name="shipmentGatewayConfTypeId" title="${uiLabelMap.FacilityShipmentGatewayConfigTypeId}">
-            <display-entity entity-name="ShipmentGatewayConfigType" key-field-name="shipmentGatewayConfTypeId" description="${description}"/>
+            <display-entity entity-name="ShipmentGatewayConfigType" key-field-name="shipmentGatewayConfTypeId"/>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
             <submit button-type="button"/>
@@ -335,7 +335,7 @@ under the License.
         <field name="description" title="${uiLabelMap.FacilityShipmentGatewayConfigTypeDescription}"><text size="60" maxlength="60"/></field>
         <field name="parentTypeId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ShipmentGatewayConfigType" description="${description}" key-field-name="shipmentGatewayConfTypeId">
+                <entity-options entity-name="ShipmentGatewayConfigType" key-field-name="shipmentGatewayConfTypeId">
                     <entity-constraint name="shipmentGatewayConfTypeId" operator="not-equals" env-name="shipmentGatewayConfTypeId"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
diff --git a/applications/workeffort/widget/CalendarForms.xml b/applications/workeffort/widget/CalendarForms.xml
index ae020a9a1a4..01e34bc8803 100644
--- a/applications/workeffort/widget/CalendarForms.xml
+++ b/applications/workeffort/widget/CalendarForms.xml
@@ -24,7 +24,7 @@ under the License.
     <form name="FilterCalendarEvents" type="single" target="calendar">
         <field name="calendarType">
             <drop-down allow-empty="false">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="CALENDAR_TYPE"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -35,7 +35,7 @@ under the License.
         </field>
         <field name="workEffortTypeId" title="${uiLabelMap.PartyEventType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="WorkEffortType" description="${description}">
+                <entity-options entity-name="WorkEffortType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -91,7 +91,7 @@ under the License.
         <!-- This is wrong. A calendar item work effort type is an EVENT. "Meeting" is a work effort purpose. -->
         <field name="workEffortTypeId" use-when="parentTypeId!=void" title="${uiLabelMap.PartyEventType}">
             <drop-down no-current-selected-key="MEETING">
-                <entity-options entity-name="WorkEffortType" description="${description}">
+                <entity-options entity-name="WorkEffortType">
                     <entity-constraint name="parentTypeId" env-name="parentTypeId" />
                     <entity-order-by field-name="description" />
                 </entity-options>
@@ -99,21 +99,21 @@ under the License.
         </field>
         <field name="workEffortTypeId" use-when="parentTypeId==void" title="${uiLabelMap.PartyEventType}">
             <drop-down>
-                <entity-options entity-name="WorkEffortType" description="${description}">
+                <entity-options entity-name="WorkEffortType">
                     <entity-order-by field-name="description" />
                 </entity-options>
             </drop-down>
         </field>
         <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
             <drop-down no-current-selected-key="CAL_TENTATIVE">
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="in" env-name="statusTypeIds"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="scopeEnumId">
             <drop-down no-current-selected-key="WES_PRIVATE">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE" />
                     <entity-order-by field-name="description" />
                 </entity-options>
@@ -137,13 +137,13 @@ under the License.
         <field name="workEffortName" title="${uiLabelMap.WorkEffortEventName}"><display/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
         <field name="workEffortTypeId" title="${uiLabelMap.PartyEventType}">
-            <display-entity entity-name="WorkEffortType" description="${description}"/>
+            <display-entity entity-name="WorkEffortType"/>
         </field>
         <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="scopeEnumId">
-            <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+            <display-entity entity-name="Enumeration" key-field-name="enumId"/>
         </field>
         <field name="estimatedStartDate"><display type="date-time"></display></field>
         <field name="estimatedCompletionDate"><display type="date-time"></display></field>
@@ -163,9 +163,9 @@ under the License.
         <field name="partyId" >
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName} ${firstName} ${middleName}"/>
         </field>
-        <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
+        <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
         <field name="statusId" use-when="workEffort!=null">
-            <display-entity entity-name="StatusItem" description="${description}"/>
+            <display-entity entity-name="StatusItem"/>
         </field>
     </form>
     <form name="showCalEventRolesDel" type="list" extends="showCalEventRoles" target="deleteWorkEffortPartyAssign">
@@ -177,7 +177,7 @@ under the License.
         <field name="partyId" position="1"><lookup target-form-name="LookupPartyName" size="10"></lookup></field>
         <field name="roleTypeId" position="2">
             <drop-down no-current-selected-key="CAL_ATTENDEE">
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-constraint name="parentTypeId" value="CALENDAR_ROLE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
diff --git a/applications/workeffort/widget/LookupForms.xml b/applications/workeffort/widget/LookupForms.xml
index efbac1b7034..72bfd586404 100644
--- a/applications/workeffort/widget/LookupForms.xml
+++ b/applications/workeffort/widget/LookupForms.xml
@@ -29,14 +29,14 @@ under the License.
         <field name="workEffortName"><text-find/></field>
         <field name="workEffortTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="WorkEffortType" key-field-name="workEffortTypeId">
+                <entity-options entity-name="WorkEffortType" key-field-name="workEffortTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="workEffortPurposeTypeId" >
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
+                <entity-options entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -63,7 +63,7 @@ under the License.
         <field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field>
         <field name="scopeEnumId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -97,14 +97,14 @@ under the License.
         <field name="workEffortName"><text-find/></field>
         <field name="workEffortTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="WorkEffortType" key-field-name="workEffortTypeId">
+                <entity-options entity-name="WorkEffortType" key-field-name="workEffortTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="workEffortPurposeTypeId" >
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
+                <entity-options entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/workeffort/widget/TimesheetForms.xml b/applications/workeffort/widget/TimesheetForms.xml
index a2a15b40a81..6274eaf59ef 100644
--- a/applications/workeffort/widget/TimesheetForms.xml
+++ b/applications/workeffort/widget/TimesheetForms.xml
@@ -54,7 +54,7 @@ under the License.
         <field name="partyId" map-name="userLogin"><hidden/></field>
         <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD" >
-                <entity-options entity-name="RateType" description="${description}">
+                <entity-options entity-name="RateType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -106,7 +106,7 @@ under the License.
         <field name="clientPartyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}*" position="1">
             <drop-down no-current-selected-key="TIMESHEET_IN_PROCESS">
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="TIMESHEET_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -188,7 +188,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRole}">
             <drop-down>
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -215,7 +215,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup size="12" target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
         <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down>
-                <entity-options entity-name="RateType" description="${description}">
+                <entity-options entity-name="RateType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -253,7 +253,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
         <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD">
-                <entity-options entity-name="RateType" description="${description}">
+                <entity-options entity-name="RateType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/applications/workeffort/widget/WorkEffortForms.xml b/applications/workeffort/widget/WorkEffortForms.xml
index 0c7d2da040c..68b33d8c127 100644
--- a/applications/workeffort/widget/WorkEffortForms.xml
+++ b/applications/workeffort/widget/WorkEffortForms.xml
@@ -24,7 +24,7 @@ under the License.
         header-row-style="header-row" default-table-style="basic-table">
         <field name="statusId">
             <drop-down no-current-selected-key="SERVICE_RUNNING">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="SERVICE_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -36,7 +36,7 @@ under the License.
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-entity entity-name="JobSandbox" default-field-type="display"/>
         <field name="statusId">
-            <display-entity entity-name="StatusItem" description="${description}"></display-entity>
+            <display-entity entity-name="StatusItem"></display-entity>
         </field>
         <field name="poolId"><hidden/></field>
         <field name="parentJobId"><hidden/></field>
@@ -61,14 +61,14 @@ under the License.
         <field name="workEffortName" title="${uiLabelMap.CommonName}*"/>
         <field name="workEffortTypeId" title="${uiLabelMap.CommonType}*" position="1">
             <drop-down>
-                <entity-options description="${description}" entity-name="WorkEffortType" key-field-name="workEffortTypeId">
+                <entity-options entity-name="WorkEffortType" key-field-name="workEffortTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="workEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}" position="2">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
+                <entity-options entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -106,7 +106,7 @@ under the License.
         </field>
         <field name="scopeEnumId" position="2">
             <drop-down no-current-selected-key="WES_PRIVATE">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -191,14 +191,14 @@ under the License.
         <field name="workEffortParentId" position="2"><text-find/></field>
         <field name="workEffortTypeId" title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="WorkEffortType" key-field-name="workEffortTypeId">
+                <entity-options entity-name="WorkEffortType" key-field-name="workEffortTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="workEffortPurposeTypeId" position="2" title="${uiLabelMap.CommonPurpose}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
+                <entity-options entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -238,7 +238,7 @@ under the License.
         <field name="fixedAssetId" position="2"><lookup target-form-name="LookupFixedAsset"/></field>
         <field name="scopeEnumId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -294,7 +294,7 @@ under the License.
         <field name="workEffortIdTo"><lookup target-form-name="LookupWorkEffort"/></field>
         <field name="workEffortAssocTypeId">
             <drop-down>
-                <entity-options entity-name="WorkEffortAssocType" description="${description}">
+                <entity-options entity-name="WorkEffortAssocType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -322,7 +322,7 @@ under the License.
         <field name="workEffortIdTo"><lookup target-form-name="LookupWorkEffort"/></field>
         <field name="workEffortAssocTypeId">
             <drop-down>
-                <entity-options entity-name="WorkEffortAssocType" description="${description}">
+                <entity-options entity-name="WorkEffortAssocType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -416,7 +416,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="workEffortTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="WorkEffortType"/></field>
-        <field name="currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="workEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}"><display-entity entity-name="WorkEffortPurposeType"/></field>
         <field name="description"><display/></field>
         <field name="priority"><display/></field>
@@ -483,7 +483,7 @@ under the License.
         <field name="thruDate"><date-time/></field>
         <field name="statusId">
             <drop-down no-current-selected-key="CLPT_PENDING">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="CONTACTLST_PARTY"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -552,7 +552,7 @@ under the License.
         <field name="communicationEventId" use-when="communicationEvent!=null"><display/></field>
         <field name="communicationEventTypeId">
             <drop-down>
-                <entity-options entity-name="CommunicationEventType" description="${description}">
+                <entity-options entity-name="CommunicationEventType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -562,7 +562,7 @@ under the License.
         <field name="partyIdTo" title="${uiLabelMap.PartyPartyId} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="statusId" use-when="communicationEvent==null" title="${uiLabelMap.CommonStatus}">
             <drop-down>
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_STATUS"/>
                 </entity-options>
             </drop-down>
@@ -578,21 +578,21 @@ under the License.
 
         <field name="contactMechTypeId" use-when="commEventContactMechType!=null&amp;&amp;parentCommEventContactMechType==null">
             <drop-down>
-                <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId">
+                <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="contactMechTypeId" use-when="commEventContactMechType==null&amp;&amp;parentCommEventContactMechType!=null">
             <drop-down>
-                <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId">
+                <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="contactMechTypeId" use-when="commEventContactMechType==null&amp;&amp;parentCommEventContactMechType==null">
             <drop-down>
-                <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId">
+                <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -600,14 +600,14 @@ under the License.
 
         <field name="roleTypeIdFrom" use-when="commEventRoleTypeIdFrom!=null">
             <drop-down>
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="roleTypeIdTo" use-when="commEventRoleTypeIdTo!=null">
             <drop-down>
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -668,16 +668,16 @@ under the License.
             <display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" key-field-name="partyId"/>
         </field>
         <field name="statusId">
-            <display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="contactMechTypeId">
-            <display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
+            <display-entity entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
         </field>
         <field name="roleTypeIdFrom">
-            <display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
+            <display-entity entity-name="RoleType" key-field-name="roleTypeId"/>
         </field>
         <field name="roleTypeIdTo">
-            <display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
+            <display-entity entity-name="RoleType" key-field-name="roleTypeId"/>
         </field>
         <field name="custReqestId" position="1"><text size="20"/></field>
         <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field>
@@ -704,21 +704,21 @@ under the License.
         <field name="partyIdTo" title="${uiLabelMap.PartyPartyId} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_STATUS"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="contactMechTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId">
+                <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="roleTypeIdFrom">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+                <entity-options entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -749,16 +749,16 @@ under the License.
             <display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" key-field-name="partyId"/>
         </field>
         <field name="statusId">
-            <display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="contactMechTypeId">
-            <display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
+            <display-entity entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
         </field>
         <field name="roleTypeIdFrom">
-            <display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
+            <display-entity entity-name="RoleType" key-field-name="roleTypeId"/>
         </field>
         <field name="roleTypeIdTo">
-            <display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
+            <display-entity entity-name="RoleType" key-field-name="roleTypeId"/>
         </field>
         <field name="custReqestId" position="1"><text size="20"/>
         </field>
@@ -782,7 +782,7 @@ under the License.
         <field name="rateCurrencyUomId"><hidden/></field>
         <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}"><display-entity entity-name="RateType"/></field>
         <field name="rateAmount"><display type="currency" currency="${rateCurrencyUomId}"/></field>
-        <field name="periodTypeId"><display-entity entity-name="PeriodType" description="${description}"/></field>
+        <field name="periodTypeId"><display-entity entity-name="PeriodType"/></field>
         <field name="deleteButton" widget-style="smallSubmit"><submit /></field>
     </form>
     <form name="AddWorkEffortRate" type="single" target="updateWorkEffortRate" title=""
@@ -794,14 +794,14 @@ under the License.
         <field name="workEffortId"><hidden/></field>
         <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD">
-                <entity-options entity-name="RateType" description="${description}">
+                <entity-options entity-name="RateType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="periodTypeId" position="2">
             <drop-down>
-                <entity-options entity-name="PeriodType" description="${description}">
+                <entity-options entity-name="PeriodType">
                     <entity-constraint name="periodTypeId" operator="like" value="RATE_%"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -843,7 +843,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup size="12" target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
         <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD">
-                <entity-options entity-name="RateType" description="${description}">
+                <entity-options entity-name="RateType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -876,7 +876,7 @@ under the License.
         <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
         <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD">
-                <entity-options entity-name="RateType" description="${description}">
+                <entity-options entity-name="RateType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -970,7 +970,7 @@ under the License.
         </field>
         <field name="workEffortContentTypeId">
             <drop-down no-current-selected-key="">
-                <entity-options entity-name="WorkEffortContentType" description="${description}" key-field-name="workEffortContentTypeId">
+                <entity-options entity-name="WorkEffortContentType" key-field-name="workEffortContentTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -993,7 +993,7 @@ under the License.
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="workEffortContentTypeId"><display-entity entity-name="WorkEffortContentType" description="${description}"/></field>
+        <field name="workEffortContentTypeId"><display-entity entity-name="WorkEffortContentType"/></field>
         <field name="fromDate"><display/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
@@ -1016,14 +1016,14 @@ under the License.
         </field>
         <field name="workEffortGoodStdTypeId">
             <drop-down no-current-selected-key="">
-                <entity-options entity-name="WorkEffortGoodStandardType" description="${description}" key-field-name="workEffortGoodStdTypeId">
+                <entity-options entity-name="WorkEffortGoodStandardType" key-field-name="workEffortGoodStdTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="WEFG_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -1040,7 +1040,7 @@ under the License.
         </actions>
         <auto-fields-service service-name="updateWorkEffortGoodStandard" default-field-type="edit"/>
         <field name="workEffortId"><hidden/></field>
-        <field name="workEffortGoodStdTypeId"><display-entity entity-name="WorkEffortGoodStandardType" description="${description}"/></field>
+        <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" target-type="inter-app">
@@ -1051,7 +1051,7 @@ under the License.
         <field name="fromDate"><display/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="WEFG_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -1079,7 +1079,7 @@ under the License.
         <field name="reviewDate"><date-time/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}*" position="1">
             <drop-down>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="WEFF_REVIEW_STTS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -1107,7 +1107,7 @@ under the License.
         <field name="reviewDate"><display/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}*">
             <drop-down>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="WEFF_REVIEW_STTS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -1239,7 +1239,7 @@ under the License.
         <field name="thruDate"><date-time/></field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="FA_ASGN_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -1247,7 +1247,7 @@ under the License.
         </field>
         <field name="availabilityStatusId">
             <drop-down no-current-selected-key="WEFA_IN_USE">
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="WEFA_AVAILABILITY"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -1291,7 +1291,7 @@ under the License.
         <field name="thruDate"><date-time/></field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="FA_ASGN_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -1299,7 +1299,7 @@ under the License.
         </field>
         <field name="availabilityStatusId">
             <drop-down no-current-selected-key="WEFA_IN_USE">
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="WEFA_AVAILABILITY"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -1362,7 +1362,7 @@ under the License.
         <field name="workEffortName" title="${uiLabelMap.WorkEffortICalendarName}" widget-style="required" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
         <field name="scopeEnumId" title="${uiLabelMap.WorkEffortICalendarVisibility}">
             <drop-down no-current-selected-key="WES_PRIVATE">
-                <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -1400,7 +1400,7 @@ under the License.
         <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
             <drop-down allow-empty="false">
-                <list-options list-name="roleList" key-name="roleTypeId" description="${description}"/>
+                <list-options list-name="roleList" key-name="roleTypeId"/>
             </drop-down>
         </field>
         <field name="fromDate"><date-time/></field>
diff --git a/applications/workeffort/widget/WorkEffortPartyAssignForms.xml b/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
index 15f58579f10..e04300fddbc 100644
--- a/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
+++ b/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
@@ -42,7 +42,7 @@ under the License.
         <field name="thruDate"><date-time/></field>
         <field name="statusId">
             <drop-down no-current-selected-key="PARTYASSIGN_UNASSIGNED">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="PRTYASGN_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -50,7 +50,7 @@ under the License.
         </field>
         <field name="availabilityStatusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="WEPA_AVAILABILITY"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -58,7 +58,7 @@ under the License.
         </field>
         <field name="expectationEnumId" title="${uiLabelMap.CommonExpectation}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="WORK_EFF_EXPECT"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -66,7 +66,7 @@ under the License.
         </field>
         <field name="delegateReasonEnumId" title="${uiLabelMap.WorkEffortDelegateReason}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="WORK_EFF_DEL_REAS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -84,7 +84,7 @@ under the License.
         <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
             <drop-down>
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -93,7 +93,7 @@ under the License.
         <field name="thruDate"><date-time/></field>
         <field name="statusId">
             <drop-down no-current-selected-key="PRTYASGN_ASSIGNED">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="PRTYASGN_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -101,7 +101,7 @@ under the License.
         </field>
         <field name="availabilityStatusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="WEPA_AVAILABILITY"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -109,7 +109,7 @@ under the License.
         </field>
         <field name="expectationEnumId" title="${uiLabelMap.CommonExpectation}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="WORK_EFF_EXPECT"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -117,7 +117,7 @@ under the License.
         </field>
         <field name="delegateReasonEnumId" title="${uiLabelMap.WorkEffortDelegateReason}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="WORK_EFF_DEL_REAS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
diff --git a/applications/workeffort/widget/WorkEffortRequirementForms.xml b/applications/workeffort/widget/WorkEffortRequirementForms.xml
index bfb05f218dc..6731311b107 100644
--- a/applications/workeffort/widget/WorkEffortRequirementForms.xml
+++ b/applications/workeffort/widget/WorkEffortRequirementForms.xml
@@ -50,7 +50,7 @@ under the License.
         <field name="requirementId"><lookup target-form-name="/ordermgr/control/LookupRequirement"/></field>
         <field name="workReqFulfTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="WorkReqFulfType" description="${description}">
+                <entity-options entity-name="WorkReqFulfType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/framework/common/widget/LookupForms.xml b/framework/common/widget/LookupForms.xml
index b3f1e04fea7..205bd7998ae 100644
--- a/framework/common/widget/LookupForms.xml
+++ b/framework/common/widget/LookupForms.xml
@@ -25,7 +25,7 @@ under the License.
         <field name="geoId" title="${uiLabelMap.CommonGeoId}"><text-find/></field>
         <field name="geoTypeId" title="${uiLabelMap.CommonGeoTypeId}">
             <drop-down allow-empty="true">
-                <entity-options key-field-name="geoTypeId" entity-name="GeoType" description="${description}">
+                <entity-options key-field-name="geoTypeId" entity-name="GeoType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -51,7 +51,7 @@ under the License.
             <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" description="${description}"/>
+            <display-entity key-field-name="geoTypeId" entity-name="GeoType"/>
         </field>
         <field name="geoName" title="${uiLabelMap.CommonGeoName}"><display/></field>
         <field name="geoCode" title="${uiLabelMap.CommonGeoCode}"><display/></field>
diff --git a/framework/webtools/widget/GeoManagementForms.xml b/framework/webtools/widget/GeoManagementForms.xml
index 040b0bac881..adefc6aa0d5 100644
--- a/framework/webtools/widget/GeoManagementForms.xml
+++ b/framework/webtools/widget/GeoManagementForms.xml
@@ -27,7 +27,7 @@
         <field name="geoPointId" title="${uiLabelMap.CommonId}"><text-find/></field>
         <field name="dataSourceId" title="${uiLabelMap.Source}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="DataSource" description="${description}">
+                <entity-options entity-name="DataSource">
                     <entity-constraint name="dataSourceTypeId" value="GEOPOINT_SUPPLIER"/>
                 </entity-options>
             </drop-down>
@@ -83,7 +83,7 @@
         <field name="geoId" title="${uiLabelMap.CommonGeoId}"><text/></field>
         <field name="geoTypeId" title="${uiLabelMap.CommonGeoTypeId}">
             <drop-down allow-empty="true">
-                <entity-options key-field-name="geoTypeId" entity-name="GeoType" description="${description}">
+                <entity-options key-field-name="geoTypeId" entity-name="GeoType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -118,7 +118,7 @@
             event="onChange" 
             action="typeValue = jQuery('#${asm_typeField}').val(); selectMultipleRelatedValues('${asm_requestName}', '${asm_paramKey}', '${asm_relatedField}', '${asm_multipleSelect}', '${asm_type}', typeValue, '${asm_responseName}');">
             <drop-down>
-                <entity-options key-field-name="geoAssocTypeId" entity-name="GeoAssocType" description="${description}">
+                <entity-options key-field-name="geoAssocTypeId" entity-name="GeoAssocType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/framework/webtools/widget/ServiceForms.xml b/framework/webtools/widget/ServiceForms.xml
index af7719d58fc..9450c5edd00 100644
--- a/framework/webtools/widget/ServiceForms.xml
+++ b/framework/webtools/widget/ServiceForms.xml
@@ -62,7 +62,7 @@ under the License.
         <field name="serviceName" title="${uiLabelMap.WebtoolsServiceName}"><text-find/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="1">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem">
+                <entity-options key-field-name="statusId" entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="SERVICE_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -98,7 +98,7 @@ under the License.
                 <parameter param-name="sel_service_name" from-field="serviceName"/>
             </hyperlink>
         </field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}" sort-field="true"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="statusId" title="${uiLabelMap.CommonStatus}" sort-field="true"><display-entity entity-name="StatusItem"/></field>
         <field name="finishDateTime" title="${uiLabelMap.CommonEndDateTime}" sort-field="true"><display/></field>
         <field name="cancelButton" title=" " use-when="startDateTime==null&amp;&amp;finishDateTime==null&amp;&amp;cancelDateTime==null" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsCancelJob}" target="cancelJob">
diff --git a/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml b/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
index 909ebe4ed7f..b3db1a098d5 100644
--- a/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
+++ b/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
@@ -26,7 +26,7 @@
         <field name="instanceOfProductId" title="${uiLabelMap.AccountingInstanceOfProductId}"><text-find ignore-case="true"/></field>
         <field name="classEnumId" title="${uiLabelMap.AccountingFixedAssetClassEnumId}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="FXAST_CLASS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -43,14 +43,14 @@
         <field name="maintHistSeqId"><text-find ignore-case="true"/></field>
         <field name="productMaintTypeId" title="${uiLabelMap.AccountingFixedAssetMaintType}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="ProductMaintType">
+                <entity-options entity-name="ProductMaintType">
                     <entity-order-by field-name="productMaintTypeId"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="FIXEDAST_MNT_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -110,7 +110,7 @@
         header-row-style="header-row" default-table-style="basic-table">
         <field name="facilityId">
             <drop-down>
-                <entity-options description="${description}" entity-name="Facility">
+                <entity-options entity-name="Facility">
                     <entity-constraint name="facilityTypeId" value="WAREHOUSE"/>
                     <entity-order-by field-name="facilityId"/>
                 </entity-options>
diff --git a/specialpurpose/assetmaint/widget/forms/ProductForms.xml b/specialpurpose/assetmaint/widget/forms/ProductForms.xml
index e33e5844c7e..05abbff3828 100644
--- a/specialpurpose/assetmaint/widget/forms/ProductForms.xml
+++ b/specialpurpose/assetmaint/widget/forms/ProductForms.xml
@@ -129,14 +129,14 @@
         <field name="productId"><hidden/></field>
         <field name="productMaintSeqId"><hidden/></field>
         <field name="productMaintTypeId">
-            <display-entity entity-name="ProductMaintType" key-field-name="productMaintTypeId" description="${description}"/>
+            <display-entity entity-name="ProductMaintType" key-field-name="productMaintTypeId"/>
         </field>
         <field name="maintName"><display/></field>
         <field name="intervalMeterTypeId">
-            <display-entity entity-name="ProductMeterType" key-field-name="productMeterTypeId" description="${description}"/>
+            <display-entity entity-name="ProductMeterType" key-field-name="productMeterTypeId"/>
         </field>
         <field name="intervalUomId">
-            <display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/>
+            <display-entity entity-name="Uom" key-field-name="uomId"/>
         </field>
         <field name="intervalQuantity"><text/></field>
         <field name="repeatCount"><text/></field>
diff --git a/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml b/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml
index ea8405811cc..b8b1d401f20 100644
--- a/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml
+++ b/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml
@@ -38,27 +38,27 @@
         <field name="workEffortIdTo"><hidden value="${parameters.workEffortId}"/></field>
         <field name="fromDate"><hidden value="${parameters.fromDate}"/></field>
         <field map-name="workEffortAssoc" name="workEffortAssocTypeId" title="${uiLabelMap.FormFieldTitle_workEffortAssocTypeId}" use-when="workEffortIdFrom!=null">
-            <display-entity entity-name="WorkEffortAssocType" description="${description}"/>
+            <display-entity entity-name="WorkEffortAssocType"/>
         </field>
         <!-- End of child workeffort fields -->
         <field map-name="workEffort" name="workEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}" position="1">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
+                <entity-options entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
                     <entity-order-by field-name="workEffortPurposeTypeId"/>
                 </entity-options>
             </drop-down>
         </field>
         <field map-name="workEffort" name="currentStatusId" title="${uiLabelMap.CommonStatus}*" position="1">
             <drop-down>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="TASK_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="EVENT_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusId" value="CAL_CANCELLED"/>
                 </entity-options>
             </drop-down>
@@ -87,7 +87,7 @@
         </actions>
         <field name="roleTypeId">
             <drop-down>
-                <list-options list-name="listMaintRoles" key-name="roleTypeId" description="${description}"/>
+                <list-options list-name="listMaintRoles" key-name="roleTypeId"/>
             </drop-down>
         </field>
         <field name="fromDate"><date-time default-value="${nowTimestamp}"/></field>
@@ -123,7 +123,7 @@
 
         <field name="workEffortAssocTypeId">
             <drop-down>
-                <entity-options entity-name="WorkEffortAssocType" description="${description}">
+                <entity-options entity-name="WorkEffortAssocType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -134,18 +134,18 @@
         <field name="workEffortName" title="${uiLabelMap.CommonName}"><text size="30"/></field>
         <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
             <drop-down>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="TASK_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusId" value="CAL_CANCELLED"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="workEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
+                <entity-options entity-name="WorkEffortPurposeType" key-field-name="workEffortPurposeTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -171,13 +171,13 @@
             </hyperlink>
         </field>
         <field name="workEffortAssocTypeId">
-            <display-entity entity-name="WorkEffortAssocType" description="${description}"/>
+            <display-entity entity-name="WorkEffortAssocType"/>
         </field>
         <field name="currentStatusId" entry-name="workEffortToCurrentStatusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="workEffortPurposeTypeId" entry-name="workEffortToWorkEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}">
-            <display-entity entity-name="WorkEffortPurposeType" description="${description}"/>
+            <display-entity entity-name="WorkEffortPurposeType"/>
         </field>
         <field name="actualStartDate" entry-name="workEffortToActualStartDate"><display/></field>
         <field name="actualCompletionDate"  entry-name="workEffortToActualCompletionDate"><display/></field>
diff --git a/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml b/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml
index 7032b5e5758..28702ad52a0 100644
--- a/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml
+++ b/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml
@@ -29,7 +29,7 @@ under the License.
         <field name="fixedAssetTypeId"><hidden value="COMPUTER_HARDWARE"/></field>
         <field name="classEnumId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="FXAST_COMPU_HARDWARE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -64,7 +64,7 @@ under the License.
         <field name="fixedAssetTypeId"><hidden value="COMPUTER_SOFTWARE"/></field>
         <field name="classEnumId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="FXAST_COMPU_SOFTWARE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
diff --git a/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml b/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml
index eede6f6ab82..df271f2f2d4 100644
--- a/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml
+++ b/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml
@@ -33,7 +33,7 @@ under the License.
         <field name="instanceOfProductId"><lookup target-form-name="LookupProduct"/></field>
         <field name="classEnumId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="FXAST_COMPU_HARDWARE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -74,7 +74,7 @@ under the License.
         <field name="instanceOfProductId"><lookup target-form-name="LookupProduct"/></field>
         <field name="classEnumId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="FXAST_COMPU_SOFTWARE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
diff --git a/specialpurpose/birt/widget/facility/FacilityForms.xml b/specialpurpose/birt/widget/facility/FacilityForms.xml
index e4993500130..33e5137830f 100644
--- a/specialpurpose/birt/widget/facility/FacilityForms.xml
+++ b/specialpurpose/birt/widget/facility/FacilityForms.xml
@@ -33,7 +33,7 @@ under the License.
         </field>
         <field name="productTypeId" title="${uiLabelMap.ProductProductType}">
             <drop-down allow-empty="true" no-current-selected-key="FINISHED_GOOD">
-                <entity-options entity-name="ProductType" description="${description}"> <!-- [${productTypeId}] -->
+                <entity-options entity-name="ProductType"> <!-- [${productTypeId}] -->
                     <entity-constraint name="isPhysical"  value="Y" operator="equals"/>
                     <entity-constraint name="parentTypeId"  value="GOOD" operator="equals"/>
                     <entity-order-by field-name="description"/>
@@ -51,10 +51,10 @@ under the License.
         </field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="INV_NON_SER_STTS"/>
                 </entity-options>
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="INV_SERIALIZED_STTS"/>
                 </entity-options>
             </drop-down>
diff --git a/specialpurpose/birt/widget/order/OrderForms.xml b/specialpurpose/birt/widget/order/OrderForms.xml
index fd7fe8e71b8..dc6c3a3dd9c 100644
--- a/specialpurpose/birt/widget/order/OrderForms.xml
+++ b/specialpurpose/birt/widget/order/OrderForms.xml
@@ -78,7 +78,7 @@ under the License.
         <field name="SalesChannel" title="${uiLabelMap.OrderSalesChannel}">
             <drop-down allow-empty="false">
                 <option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="description">
+                <entity-options entity-name="Enumeration" key-field-name="description">
                     <entity-constraint name="enumTypeId" operator="equals" value="ORDER_SALES_CHANNEL"/>
                 </entity-options>
             </drop-down>
diff --git a/specialpurpose/ebay/widget/EbayForms.xml b/specialpurpose/ebay/widget/EbayForms.xml
index dbc708cbb8c..207a3569f2f 100644
--- a/specialpurpose/ebay/widget/EbayForms.xml
+++ b/specialpurpose/ebay/widget/EbayForms.xml
@@ -202,7 +202,7 @@ under the License.
         <field name="shipmentMethodName"><display/></field>
         <field name="methodTypeEnumId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="EBAY_SHIP_TYPE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -211,7 +211,7 @@ under the License.
         <field name="carrierPartyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="shipmentMethodTypeId">
             <drop-down current="selected" allow-empty="false">
-                <entity-options entity-name="ShipmentMethodType" key-field-name="shipmentMethodTypeId" description="${description}"/>
+                <entity-options entity-name="ShipmentMethodType" key-field-name="shipmentMethodTypeId"/>
             </drop-down>
         </field>
         <field name="deleteEbayShippingMethod" title="" widget-style="buttontext">
@@ -227,7 +227,7 @@ under the License.
         <auto-fields-service service-name="createEbayShippingMethod"/>
         <field name="methodTypeEnumId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="EBAY_SHIP_TYPE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -244,7 +244,7 @@ under the License.
         <field name="carrierPartyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="shipmentMethodTypeId">
             <drop-down current="selected" allow-empty="false">
-                <entity-options entity-name="ShipmentMethodType" description="${description}"/>
+                <entity-options entity-name="ShipmentMethodType"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
diff --git a/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml b/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
index 369ae3dfaf0..183ca557dd6 100644
--- a/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
+++ b/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
@@ -552,7 +552,7 @@ under the License.
         <field name="statusId" title="Status">
             <drop-down>
                 <option key="" description="All Status"/>
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="ORDER_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
diff --git a/specialpurpose/ecommerce/widget/ForumForms.xml b/specialpurpose/ecommerce/widget/ForumForms.xml
index 94cd59acb4d..180b1c66c1a 100644
--- a/specialpurpose/ecommerce/widget/ForumForms.xml
+++ b/specialpurpose/ecommerce/widget/ForumForms.xml
@@ -81,12 +81,12 @@ under the License.
         </field>
         <field name="section" >
             <drop-down no-current-selected-key="${targetSection}" allow-empty="true">
-                <list-options list-name="sectionList" key-name="contentId" description="${description}"/>
+                <list-options list-name="sectionList" key-name="contentId"/>
             </drop-down>
         </field>
         <field name="topic" position="1">
             <drop-down  no-current-selected-key="${targetTopic}" allow-empty="true">
-                <entity-options entity-name="Content" key-field-name="contentId" description="${description}">
+                <entity-options entity-name="Content" key-field-name="contentId">
                     <entity-constraint name="contentTypeId" value="TOPIC"/>
                     <entity-order-by field-name="contentId"/>
                 </entity-options>
@@ -256,22 +256,22 @@ under the License.
         <field name="textData" title="${uiLabelMap.ContentText}" id-name="textData"><textarea rows="20" cols="60"/></field>
         <field name="statusId" >
             <drop-down allow-empty="false" no-current-selected-key="SUBSCRIBE_BRONZE">
-                <list-options list-name="statusList" key-name="statusId" description="${description}"/>
+                <list-options list-name="statusList" key-name="statusId"/>
             </drop-down>
         </field>
         <field name="privilegeEnumId" >
             <drop-down allow-empty="false" no-current-selected-key="SUBSCRIBE_BRONZE">
-                <list-options list-name="privilegeList" key-name="enumId" description="${description}"/>
+                <list-options list-name="privilegeList" key-name="enumId"/>
             </drop-down>
         </field>
         <field name="section" >
             <drop-down no-current-selected-key="${targetSection}" allow-empty="true">
-                <list-options list-name="sectionList" key-name="contentId" description="${description}"/>
+                <list-options list-name="sectionList" key-name="contentId"/>
             </drop-down>
         </field>
         <field name="topic" position="1">
             <drop-down  no-current-selected-key="${targetTopic}" allow-empty="true">
-                <list-options list-name="topicList" key-name="contentId" description="${description}"/>
+                <list-options list-name="topicList" key-name="contentId"/>
             </drop-down>
         </field>
         <!--
@@ -334,7 +334,7 @@ under the License.
         <field name="contentId"><display/></field>
         <field name="contentTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="ContentType" key-field-name="contentTypeId"/>
+                <entity-options entity-name="ContentType" key-field-name="contentTypeId"/>
             </drop-down>
         </field>
         <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}">
@@ -356,12 +356,12 @@ under the License.
         </field>
         <field name="characterSetId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="CharacterSet" key-field-name="characterSetId"/>
+                <entity-options entity-name="CharacterSet" key-field-name="characterSetId"/>
             </drop-down>
         </field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="CONTENT_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -389,17 +389,17 @@ under the License.
         <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"></field>
         <field name="dataResourceTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
+                <entity-options entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
             </drop-down>
         </field>
         <field name="dataTemplateTypeId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
+                <entity-options entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
             </drop-down>
         </field>
         <field name="statusId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="CONTENT_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -419,7 +419,7 @@ under the License.
         </field>
         <field name="characterSetId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="CharacterSet" key-field-name="characterSetId"/>
+                <entity-options entity-name="CharacterSet" key-field-name="characterSetId"/>
             </drop-down>
         </field>
         <field name="createdDate"><display/></field>
diff --git a/specialpurpose/example/widget/example/ExampleFeatureForms.xml b/specialpurpose/example/widget/example/ExampleFeatureForms.xml
index 179650d9df6..6cccbaef817 100644
--- a/specialpurpose/example/widget/example/ExampleFeatureForms.xml
+++ b/specialpurpose/example/widget/example/ExampleFeatureForms.xml
@@ -91,7 +91,7 @@ under the License.
         <field name="fromDate"><display/></field>
         <field name="exampleFeatureApplTypeId" title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ExampleFeatureApplType" description="${description}">
+                <entity-options entity-name="ExampleFeatureApplType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -125,7 +125,7 @@ under the License.
         </field>
         <field name="exampleFeatureApplTypeId" title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="ExampleFeatureApplType" description="${description}">
+                <entity-options entity-name="ExampleFeatureApplType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/specialpurpose/example/widget/example/ExampleForms.xml b/specialpurpose/example/widget/example/ExampleForms.xml
index 3d09c306253..b7482cd74f7 100644
--- a/specialpurpose/example/widget/example/ExampleForms.xml
+++ b/specialpurpose/example/widget/example/ExampleForms.xml
@@ -169,14 +169,14 @@ under the License.
         <field name="exampleTypeId" title="${uiLabelMap.CommonType}" id-name="exampleTypeId" widget-style="required">
             <drop-down allow-empty="false">
                 <!-- this is a neat feature, but not good for the type because the user would have to know the possible types in order to enter at least the first letter, so leaving it out by default; just uncomment to enable: <auto-complete/> -->
-                <entity-options entity-name="ExampleType" description="${description}">
+                <entity-options entity-name="ExampleType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="statusId"  use-when="example==null" title="${uiLabelMap.CommonStatus}" widget-style="required">
             <drop-down allow-empty="false">
-                <entity-options entity-name="ExampleStatusItem" description="${description}"/>
+                <entity-options entity-name="ExampleStatusItem"/>
             </drop-down>
         </field>
         <field name="statusId" use-when="example!=null" title="${uiLabelMap.CommonStatus}" widget-style="required">
@@ -192,7 +192,7 @@ under the License.
         <field name="anotherText">
             <drop-down allow-empty="true">
                 <option key="Explicit Option" description="${uiLabelMap.ExampleExplicitOption}"/>
-                <entity-options entity-name="ExampleType" description="${description}" key-field-name="exampleTypeId">
+                <entity-options entity-name="ExampleType" key-field-name="exampleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -210,7 +210,7 @@ under the License.
         <alt-target use-when="example==null" target="createExampleAjax"/>
         <field name="statusId" use-when="example==null" title="${uiLabelMap.CommonStatus}" id-name="statusId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="ExampleStatusItem" description="${description}"/>
+                <entity-options entity-name="ExampleStatusItem"/>
             </drop-down>
         </field>
         <on-event-update-area event-type="submit" area-id="ListExamplesAjax" area-target="ListExampleFormOnly"/>
@@ -272,7 +272,7 @@ under the License.
         <auto-fields-service service-name="updateExampleFeatureAppl"/>
         <field name="exampleId"><hidden/></field>
         <field name="exampleFeatureId" title="${uiLabelMap.ExampleFeature}">
-            <display-entity entity-name="ExampleFeature" description="${description}">
+            <display-entity entity-name="ExampleFeature">
                 <sub-hyperlink target="EditExampleFeature" description="${exampleFeatureId}" link-style="buttontext">
                     <parameter param-name="exampleFeatureId"/>
                 </sub-hyperlink>
@@ -281,7 +281,7 @@ under the License.
         <field name="fromDate"><display/></field>
         <field name="exampleFeatureApplTypeId" title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="ExampleFeatureApplType" description="${description}">
+                <entity-options entity-name="ExampleFeatureApplType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -304,7 +304,7 @@ under the License.
         </field>
         <field name="exampleFeatureApplTypeId" title="${uiLabelMap.CommonType}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="ExampleFeatureApplType" description="${description}">
+                <entity-options entity-name="ExampleFeatureApplType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/specialpurpose/example/widget/example/FormWidgetExampleForms.xml b/specialpurpose/example/widget/example/FormWidgetExampleForms.xml
index fb205bf33af..8b3bf8d6ffa 100644
--- a/specialpurpose/example/widget/example/FormWidgetExampleForms.xml
+++ b/specialpurpose/example/widget/example/FormWidgetExampleForms.xml
@@ -187,9 +187,7 @@ under the License.
                title="${uiLabelMap.ExampleDropDownField3Title}"
                tooltip="${uiLabelMap.ExampleToDo}" tooltip-style="button-text">
             <drop-down>
-                <entity-options entity-name="ExampleType"
-                                key-field-name="exampleTypeId"
-                                description="${description}">
+                <entity-options entity-name="ExampleType" key-field-name="exampleTypeId">
                     <entity-order-by field-name="-description"/>
                 </entity-options>
             </drop-down>
@@ -215,8 +213,7 @@ under the License.
                title="${uiLabelMap.ExampleDropDownField6Title}"
                tooltip="${uiLabelMap.ExampleToDo}" tooltip-style="button-text">
             <drop-down>
-                <entity-options entity-name="ExampleType"
-                                description="${description}"/>
+                <entity-options entity-name="ExampleType"/>
             </drop-down>
         </field>
         <!-- ***************** -->
@@ -226,9 +223,7 @@ under the License.
             title="${uiLabelMap.ExampleDropDownField7Title}"
             tooltip="${uiLabelMap.ExampleToDo}" tooltip-style="button-text">
             <drop-down>
-                <entity-options entity-name="ExampleType"
-                    key-field-name="exampleTypeId"
-                    description="${description}">
+                <entity-options entity-name="ExampleType" key-field-name="exampleTypeId">
                     <entity-constraint name="exampleTypeId"
                         value="INSPIRED"
                         operator="greater"/>
@@ -394,7 +389,7 @@ under the License.
     <form name="SelectionBoxesExampleForm" type="single">
         <field name="ExampleTypeId">
            <check>
-              <entity-options key-field-name="exampleTypeId" description="${description}" entity-name="ExampleType"/>
+              <entity-options key-field-name="exampleTypeId" entity-name="ExampleType"/>
            </check>
         </field>
     </form>
diff --git a/specialpurpose/googlebase/widget/GoogleBaseForms.xml b/specialpurpose/googlebase/widget/GoogleBaseForms.xml
index b5f3f2e08a7..78fff51154a 100644
--- a/specialpurpose/googlebase/widget/GoogleBaseForms.xml
+++ b/specialpurpose/googlebase/widget/GoogleBaseForms.xml
@@ -62,7 +62,7 @@ under the License.
         <field name="trackingCodeId">
             <drop-down no-current-selected-key="_NA_">
                 <option key="_NA_" description="${uiLabelMap.GoogleBaseExportNoTrackingRequested}"/>
-                <entity-options entity-name="TrackingCode" description="${description}">
+                <entity-options entity-name="TrackingCode">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
diff --git a/specialpurpose/googlecheckout/widget/GoogleCheckoutForms.xml b/specialpurpose/googlecheckout/widget/GoogleCheckoutForms.xml
index 569bad969ff..dc611e96a18 100644
--- a/specialpurpose/googlecheckout/widget/GoogleCheckoutForms.xml
+++ b/specialpurpose/googlecheckout/widget/GoogleCheckoutForms.xml
@@ -32,7 +32,7 @@ under the License.
         <field name="productStoreId"><display/></field>
         <field name="envEnumId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="GOOGLE_ENV_TYPE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -80,7 +80,7 @@ under the License.
         </field>
         <field name="envEnumId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="GOOGLE_ENV_TYPE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -124,7 +124,7 @@ under the License.
         <field name="shipmentMethodName"><display/></field>
         <field name="methodTypeEnumId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="GOOGLE_SHIP_TYPE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -133,7 +133,7 @@ under the License.
         <field name="carrierPartyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="shipmentMethodTypeId">
             <drop-down current="selected" allow-empty="false">
-                <entity-options entity-name="ShipmentMethodType" key-field-name="shipmentMethodTypeId" description="${description}"/>
+                <entity-options entity-name="ShipmentMethodType" key-field-name="shipmentMethodTypeId"/>
             </drop-down>
         </field>
         <field name="deleteGoogleCheckoutShippingMethod" title="" widget-style="buttontext">
@@ -149,7 +149,7 @@ under the License.
         <auto-fields-service service-name="createGoogleCheckoutShippingMethod"/>
         <field name="methodTypeEnumId">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" operator="equals" value="GOOGLE_SHIP_TYPE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -166,7 +166,7 @@ under the License.
         <field name="carrierPartyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="shipmentMethodTypeId">
             <drop-down current="selected" allow-empty="false">
-                <entity-options entity-name="ShipmentMethodType" description="${description}"/>
+                <entity-options entity-name="ShipmentMethodType"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
diff --git a/specialpurpose/oagis/widget/forms/MessageInfoForms.xml b/specialpurpose/oagis/widget/forms/MessageInfoForms.xml
index 1508da544dd..f0add0e09bf 100644
--- a/specialpurpose/oagis/widget/forms/MessageInfoForms.xml
+++ b/specialpurpose/oagis/widget/forms/MessageInfoForms.xml
@@ -49,7 +49,7 @@ under the License.
         <auto-fields-service service-name="updateOagisMessageInfo" default-field-type="edit"/>
          <field name="processingStatusId">
               <drop-down allow-empty="true" >
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId"/>
+                <entity-options entity-name="StatusItem" key-field-name="statusId"/>
             </drop-down>
          </field>
          <field name="orderId" >
diff --git a/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml b/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml
index b221d101306..4d79959db31 100644
--- a/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml
+++ b/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml
@@ -89,8 +89,8 @@ under the License.
             <set field="projectId" from-field="result.projectId"/>
             <set field="projectName" from-field="result.projectName"/>
         </actions>
-        <field name="custRequestTypeId"><display-entity entity-name="CustRequestType" description="${description}"/></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="custRequestTypeId"><display-entity entity-name="CustRequestType"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"/></field>
         <field name="fromPartyId">
             <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}" key-field-name="partyId">
                 <sub-hyperlink target="viewprofile" description="[${fromPartyId}]">
diff --git a/specialpurpose/projectmgr/widget/forms/ProjectForms.xml b/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
index 9b9e694e2d3..782f47ad0f1 100644
--- a/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
+++ b/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
@@ -78,7 +78,7 @@
         </field>
         <field name="scopeEnumId" title="${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}">
             <drop-down allow-empty="false" no-current-selected-key="WES_PRIVATE">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -148,7 +148,7 @@
         </field>
         <field name="hours" position="2"><display/></field>
         <field name="timesheetPartyId" position="2"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName}" key-field-name="partyId"/></field>
-        <field name="rateTypeId" title="${uiLabelMap.ProjectMgrRateTypeId}" position="2"><display-entity entity-name="RateType" description="${description}"/></field>
+        <field name="rateTypeId" title="${uiLabelMap.ProjectMgrRateTypeId}" position="2"><display-entity entity-name="RateType"/></field>
         <field name="fromDate" position="2"><display type="date"/></field>
     </form>
     <form name="ListProjects" type="list" list-name="listIt" paginate-target="FindProject"
@@ -177,7 +177,7 @@
                 <parameter param-name="projectId" from-field="resultProject.projectInfo.projectId"/>
             </hyperlink>
         </field>
-        <field name="currentStatusId" map-name="resultProject.projectInfo" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="currentStatusId" map-name="resultProject.projectInfo" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="estimatedStartDate" map-name="resultProject.projectInfo" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}"><display type="date"/></field>
         <field name="estimatedCompletionDate" map-name="resultProject.projectInfo" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}"><display type="date"/></field>
         <field name="actualStartDate" map-name="resultProject.projectInfo" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><display type="date"/></field>
@@ -199,7 +199,7 @@
                 <parameter param-name="projectId"/>
             </hyperlink>
         </field>
-        <field name="currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="estimatedStartDate" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}"><display type="date"/></field>
         <field name="estimatedCompletionDate" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}"><display type="date"/></field>
         <field name="actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><display type="date"/></field>
@@ -225,7 +225,7 @@
                 <parameter param-name="projectId" from-field="workEffortId"/>
             </hyperlink>
         </field>
-        <field name="currentStatusId" title="${uiLabelMap.CommonStatus}" parameter-name="dummy"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="currentStatusId" title="${uiLabelMap.CommonStatus}" parameter-name="dummy"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="priority" title="${uiLabelMap.CommonPriority}"><display/></field>
         <field name="estimatedStartDate"><display type="date"/></field>
         <field name="estimatedCompletionDate"><display type="date"/></field>
@@ -240,7 +240,7 @@
         header-row-style="header-row" default-table-style="basic-table">
         <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><display/></field>
         <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="priority" title="${uiLabelMap.CommonPriority}"><display/></field>
         <field name="parentProjectId" title="${uiLabelMap.ProjectMgrParentProjectName}">
@@ -329,10 +329,10 @@
             <text/>
         </field>
          <field name="workEffortTypeId" title="${uiLabelMap.CommonType}">
-            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" description="${description}" also-hidden="false"/>
+            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" also-hidden="false"/>
          </field>
         <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}" also-hidden="false"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId" also-hidden="false"/>
          </field>
         <field name="plannedHours" parameter-name="estimatedDuration" title="${uiLabelMap.ProjectMgrPlannedHours}"><text size="3"/></field>
         <field name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
@@ -419,7 +419,7 @@
                 <parameter param-name="projectId"/>
             </hyperlink>
         </field>
-        <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="priority"><display/></field>
         <field name="startDate"><display type="date"/></field>
         <field name="completionDate"><display type="date"/></field>
@@ -441,7 +441,7 @@
         </field>
         <field name="phaseName"><display/></field>
         <field name="firstResource"><display description="${resources[0].lastName},${resources[0].firstName} ${resources[0].middleName}"/></field>
-        <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="priority"  title="${uiLabelMap.ProjectMgrProrityAbbr}"><display/></field>
         <field name="startDate"><display type="date"/></field>
         <field name="estimatedCompletionDate" title="${uiLabelMap.ProjectMgrEstimatedCompletionDateAbbr}"><display type="date"/></field>
@@ -462,8 +462,8 @@
             </hyperlink>
         </field>
         <field name="orderName"><display/></field>
-        <field name="orderTypeId"><display-entity entity-name="OrderType" description="${description}"/></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="orderTypeId"><display-entity entity-name="OrderType"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"/></field>
         <field name="orderDate"><display/></field>
         <field name="entryDate"><display/></field>
         <field name="linkProjectOrder" title=" " widget-style="buttontext" use-when="headerItem.equals(&quot;editProjectOrders&quot;)">
@@ -520,7 +520,7 @@
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
-        <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
+        <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date-time"/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date-time"/></field>
         <field name="actualHours" entry-name="actualHours" map-name="result.projectInfo"><display/></field>
@@ -534,7 +534,7 @@
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
-        <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
+        <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date-time"/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date-time"/></field>
     </form>
@@ -552,10 +552,10 @@
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
-        <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
+        <field name="roleTypeId"><display-entity entity-name="RoleType"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date-time"/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date-time"/></field>
-        <field name="currencyUomId"><display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/></field>
+        <field name="currencyUomId"><display-entity entity-name="Uom" key-field-name="uomId"/></field>
     </form>
     <form name="EditWorkEffortPartyAssigns" target="deleteWorkEffortPartyAssign" title="" type="list" paginate-target="ListWorkEffortPartyAssigns"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
@@ -642,7 +642,7 @@
         </field>
         <field entry-name="xx" name="roleTypeId" use-when="workEffortId==projectId &amp;&amp; parameters.get(&quot;partyId&quot;)!=null" title="${uiLabelMap.PartyRoleType}">
             <drop-down>
-                <entity-options entity-name="PartyRoleDetailAndPartyDetail" description="${description}">
+                <entity-options entity-name="PartyRoleDetailAndPartyDetail">
                     <entity-constraint name="parentTypeId" value="PROJECT_TEAM"/>
                     <entity-constraint name="partyId" env-name="parameters.partyId"/>
                 </entity-options>
@@ -650,7 +650,7 @@
         </field>
         <field entry-name="xx" name="roleTypeId" use-when="workEffortId!=projectId &amp;&amp; parameters.get(&quot;partyId&quot;)!=null" title="${uiLabelMap.PartyRoleType}">
             <drop-down>
-                <entity-options entity-name="WorkEffortPartyAssignAndRoleType" description="${description}">
+                <entity-options entity-name="WorkEffortPartyAssignAndRoleType">
                     <entity-constraint name="workEffortId" env-name="projectId"/>
                     <entity-constraint name="partyId" env-name="parameters.partyId"/>
                 </entity-options>
@@ -701,8 +701,8 @@
                 <parameter param-name="projectId" from-field="resultProject.projectId"/>
             </hyperlink>
         </field>
-        <field entry-name="currentStatusId" name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
-        <field entry-name="statusId" name="Status" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field entry-name="currentStatusId" name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+        <field entry-name="statusId" name="Status" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="workEffortId"><hidden value="${workEffortId}"/></field>
         <field name="priority" title="${uiLabelMap.CommonPriority}" widget-area-style="centered">
             <display description="${priority}"/>
@@ -754,7 +754,7 @@
             </hyperlink>
         </field>
         <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="priority" widget-area-style="centered"><display description="${Priority}"/></field>
         <field name="estimatedStartDate" widget-area-style="centered"><display type="date"/></field>
@@ -784,7 +784,7 @@
         <field use-when="project==null" name="currentStatusId"><hidden value="_NA_"/></field>
         <field entry-name="test" name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
             <drop-down>
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-constraint name="parentTypeId" value="PROJECT_TEAM"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -812,7 +812,7 @@
         </field>
         <field entry-name="test" name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
             <drop-down>
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-constraint name="parentTypeId" value="PROJECT_TEAM"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -903,11 +903,11 @@
             <lookup target-form-name="LookupTreeContent"/>
         </field>
         <field name="workEffortContentTypeId" use-when="workEffortContent!=null" map-name="workEffortContent">
-            <display-entity entity-name="WorkEffortContentType" description="${description}"/>
+            <display-entity entity-name="WorkEffortContentType"/>
         </field>
         <field name="workEffortContentTypeId" use-when="workEffortContent==null">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="WorkEffortContentType"/>
+                <entity-options entity-name="WorkEffortContentType"/>
             </drop-down>
         </field>
         <!-- note sure if these two are necessray, but they are kind of confusing in this context:
@@ -916,12 +916,12 @@
         -->
         <field name="contentTypeId" use-when="workEffortContent!=null">
             <drop-down allow-empty="false" no-current-selected-key="DOCUMENT">
-                <entity-options description="${description}" entity-name="ContentType"/>
+                <entity-options entity-name="ContentType"/>
             </drop-down>
         </field>
         <!--field name="statusId" use-when="content==null">
             <drop-down allow-empty="false" no-current-selected-key="CTNT_AVAILABLE">
-                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="CONTENT_STATUS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
@@ -937,7 +937,7 @@
         </field-->
         <field name="mimeTypeId" >
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="MimeType" key-field-name="mimeTypeId"/>
+                <entity-options entity-name="MimeType" key-field-name="mimeTypeId"/>
             </drop-down>
         </field>
         <field name="dataResourceName" use-when="workEffortContent==null" title="${uiLabelMap.CommonUpload}"><file/></field>
diff --git a/specialpurpose/projectmgr/widget/forms/ResourceForms.xml b/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
index 3e553a7b1c9..70532db23a1 100644
--- a/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
+++ b/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
@@ -70,7 +70,7 @@
         <field name="PartyId" parameter-name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-constraint name="parentTypeId" operator="equals" value="PROJECT_TEAM"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -81,7 +81,7 @@
     <form name="AddPartyRole" extends="AddPartyRole" extends-resource="component://party/widget/partymgr/PartyForms.xml">
         <field name="roleTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-constraint name="parentTypeId" operator="equals" value="PROJECT_TEAM"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
diff --git a/specialpurpose/projectmgr/widget/forms/TaskForms.xml b/specialpurpose/projectmgr/widget/forms/TaskForms.xml
index 664ba9413ba..82252a4369d 100644
--- a/specialpurpose/projectmgr/widget/forms/TaskForms.xml
+++ b/specialpurpose/projectmgr/widget/forms/TaskForms.xml
@@ -67,7 +67,7 @@
         <field name="taskSeqId" entry-name="sequenceNum" parameter-name="sequenceNum" title="${uiLabelMap.FormFieldTitle_sequenceNum}"><text size="3"/></field>
         <field name="roleTypeId" use-when="myTask!=void" title="${uiLabelMap.ProjectMgrMyRoleForThisTask}">
             <drop-down current="selected" allow-empty="false">
-                    <entity-options entity-name="ProjectIdPartyRoleAndPhase" description="${description}">
+                    <entity-options entity-name="ProjectIdPartyRoleAndPhase">
                         <entity-constraint name="partyId" operator="equals" env-name="userLogin.partyId"/>
                         <entity-constraint name="phaseId" operator="equals" env-name="parameters.workEffortParentId"/>
                         <entity-order-by field-name="description"/>
@@ -77,7 +77,7 @@
         <field name="estimatedHours" use-when="myTask!=void" title="${uiLabelMap.ProjectMgrEstimatedHours}"><text size="5"/></field>
         <field name="skillTypeId" use-when="myTask!=void" title="${uiLabelMap.HumanResSkillTypeId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="SkillType" description="${description}"/>
+                <entity-options entity-name="SkillType"/>
             </drop-down>
         </field>
         <field name="currentStatusId" use-when="task!=null&amp;&amp;task!=void"><hidden/></field>
@@ -104,7 +104,7 @@
         <field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonMax250Chars}"><textarea/></field>
         <field name="scopeEnumId" title="${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}">
             <drop-down allow-empty="false" no-current-selected-key="WES_PRIVATE">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -158,7 +158,7 @@
         <field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}"><text-find ignore-case="true"/></field>
         <field name="currentStatusId">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="PROJECT_TASK_STATUS"/>
                     <entity-constraint name="statusId" operator="not-equals" value="PTS_CREATED_UA"/>
                     <entity-constraint name="statusId" operator="not-equals" value="PTS_CREATED_AS"/>
@@ -249,7 +249,7 @@
                 <parameter param-name="projectId" from-field="resultProject.projectId"/>
             </hyperlink>
         </field>
-        <!--field entry-name="result.taskInfo.currentStatusId" name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field-->
+        <!--field entry-name="result.taskInfo.currentStatusId" name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field-->
         <field name="priority"><display/></field>
         <field name="estimatedStartDate"><display type="date"/></field>
         <field name="estimatedCompletionDate" red-when="before-now"><display type="date"/></field>
@@ -257,7 +257,7 @@
         <field name="actualCompletionDate" red-when="before-now"><display type="date"/></field>
         <field entry-name="result.taskInfo.plannedHours" name="plannedHours" title="${uiLabelMap.ProjectMgrPlannedHours}"><display/></field>
         <field entry-name="result.taskInfo.actualHours" name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
         <field name="partyId" parameter-name="newPartyId">
             <drop-down>
                 <entity-options entity-name="PartyDetailAndWorkEffortAssign" description="${firstName} ${middleName} ${lastName} ${groupName}">
@@ -268,7 +268,7 @@
         </field>
         <field name="roleTypeId" parameter-name="newRoleTypeId" title="${uiLabelMap.PartyRole}">
             <drop-down>
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-constraint name="parentTypeId" value="PROJECT_TEAM"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -318,7 +318,7 @@
         </field>
         <field name="roleTypeId">
             <drop-down current="selected" allow-empty="false">
-                <entity-options entity-name="ProjectIdPartyRoleAndTask" description="${description}">
+                <entity-options entity-name="ProjectIdPartyRoleAndTask">
                     <entity-constraint name="partyId" operator="equals" env-name="userLogin.partyId"/>
                     <entity-constraint name="taskId" operator="equals" env-name="parameters.workEffortId"/>
                     <entity-order-by field-name="description"/>
@@ -344,7 +344,7 @@
             </hyperlink>
         </field>
         <field name="workEffortParentId" entry-name="r.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>
-        <field name="currentStatusId" entry-name="r.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="currentStatusId" entry-name="r.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="estimatedStartDate" entry-name="r.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
         <field name="estimatedCompletionDate"  entry-name="r.taskInfo.estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
         <field name="actualStartDate" entry-name="r.taskInfo.actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><display type="date"/></field>
@@ -369,7 +369,7 @@
             </hyperlink>
         </field>
         <field name="workEffortParentId" entry-name="r.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>
-        <field name="currentStatusId" entry-name="r.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="currentStatusId" entry-name="r.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="estimatedStartDate" entry-name="r.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
         <field name="estimatedCompletionDate"  entry-name="r.taskInfo.estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
         <field name="actualStartDate" entry-name="r.taskInfo.actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><display type="date"/></field>
@@ -417,7 +417,7 @@
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="skillTypeId" title="${uiLabelMap.ProjectMgrSkillType}"><display-entity entity-name="SkillType" description="${description}"/></field>
+        <field name="skillTypeId" title="${uiLabelMap.ProjectMgrSkillType}"><display-entity entity-name="SkillType"/></field>
         <field name="estimatedNumPeople" title="${uiLabelMap.ProjectMgrEstimatedNumPeople}"><text/></field>
         <field name="estimatedDuration" title="${uiLabelMap.ProjectMgrEstimatedDuration}"><text/></field>
         <field name="estimatedCost" title="${uiLabelMap.ProjectMgrEstimatedCost}" widget-style="linktext"><text/></field>
@@ -426,7 +426,7 @@
     <form name="AddTaskSkill" type="single" target="createTaskSkillStandard">
         <field name="workEffortId"><hidden value="${workEffortId}"/></field>
         <field name="skillTypeId"><drop-down>
-            <entity-options entity-name="SkillType" description="${description}"/>
+            <entity-options entity-name="SkillType"/>
         </drop-down>
         </field>
         <field name="estimatedNumPeople" title="${uiLabelMap.ProjectMgrEstimatedNumPeople}"><text/></field>
@@ -464,7 +464,7 @@
         </field>
         <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD">
-                <entity-options entity-name="RateType" description="${description}">
+                <entity-options entity-name="RateType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -495,7 +495,7 @@
         </field>
         <field name="roleTypeId" title="${uiLabelMap.ProjectMgrPartyRoleTypeId}">
             <drop-down>
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-constraint name="parentTypeId" value="PROJECT_TEAM"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -503,7 +503,7 @@
         </field>
         <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD">
-                <entity-options entity-name="RateType" description="${description}">
+                <entity-options entity-name="RateType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -549,7 +549,7 @@
             </hyperlink>
         </field>
         <field name="taskDescription" title="${uiLabelMap.CommonDescription}"><display/></field>
-        <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="priority" title="${uiLabelMap.CommonPriority}"><display/></field>
         <field name="estimatedStartDate"><display type="date"/></field>
         <field name="estimatedCompletionDate"><display type="date"/></field>
@@ -601,7 +601,7 @@
                 <parameter param-name="partyId"/>
             </hyperlink>
         </field>
-        <field name="roleTypeId" title="${uiLabelMap.ProjectMgrPartyRoleTypeId}"><display-entity entity-name="RoleType" description="${description}"/></field>
+        <field name="roleTypeId" title="${uiLabelMap.ProjectMgrPartyRoleTypeId}"><display-entity entity-name="RoleType"/></field>
         <field name="plannedHours"><display/></field>
         <field name="originalActualHours"><display/></field>
         <field name="actualHours"><display/></field>
@@ -621,10 +621,10 @@
                 <parameter param-name="fromDate"/>
             </hyperlink>
         </field>
-        <field name="contentTypeId"><display-entity entity-name="ContentType" description="${description}"/></field>
-        <field name="workEffortContentTypeId"><display-entity entity-name="WorkEffortContentType" description="${description}"/></field>
+        <field name="contentTypeId"><display-entity entity-name="ContentType"/></field>
+        <field name="workEffortContentTypeId"><display-entity entity-name="WorkEffortContentType"/></field>
         <field name="fromDate"><display/></field>
-        <field name="drMimeTypeId"><display-entity entity-name="MimeType" description="${description}" key-field-name="mimeTypeId"/></field>
+        <field name="drMimeTypeId"><display-entity entity-name="MimeType" key-field-name="mimeTypeId"/></field>
     </form>
     <form name="ListWorkEffortRequests" type="list"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
@@ -664,7 +664,7 @@
             </hyperlink>
         </field>
         <field name="workEffortParentId" entry-name="result.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>
-        <field name="currentStatusId" entry-name="result.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="currentStatusId" entry-name="result.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="estimatedStartDate" entry-name="result.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
         <field name="estimatedCompletionDate"  entry-name="result.taskInfo.estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
         <field name="actualStartDate" entry-name="result.taskInfo.actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><display type="date"/></field>
@@ -691,7 +691,7 @@
             </hyperlink>
         </field>
         <field name="workEffortParentId" entry-name="result.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>
-        <field name="currentStatusId" entry-name="result.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="currentStatusId" entry-name="result.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="estimatedStartDate" entry-name="result.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
         <field name="estimatedCompletionDate"  entry-name="result.taskInfo.estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
         <field name="actualStartDate" entry-name="result.taskInfo.actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><display type="date"/></field>
@@ -729,7 +729,7 @@
         </field>
         <field name="taskScopeEnumId" parameter-name="scopeEnumId" title="${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}">
             <drop-down allow-empty="false" no-current-selected-key="WES_PRIVATE">
-                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                <entity-options entity-name="Enumeration" key-field-name="enumId">
                     <entity-constraint name="enumTypeId" value="WORK_EFF_SCOPE"/>
                     <entity-order-by field-name="description"/>
                     </entity-options>
diff --git a/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml b/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
index c428adf4f84..e8d0ee347fb 100644
--- a/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
+++ b/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
@@ -51,7 +51,7 @@
         <field name="checkComplete" title="${uiLabelMap.ProjectMgrCheckComplete}"><check/></field>
         <field name="rateTypeId" title="${uiLabelMap.ProjectMgrRateTypeId}">
             <drop-down allow-empty="false" no-current-selected-key="${defaultRateTypeId}">
-                <entity-options entity-name="RateType" description="${description}"/>
+                <entity-options entity-name="RateType"/>
             </drop-down>
         </field>
         <field name="d0" parameter-name="hoursDay0" title="${uiLabelMap.ProjectMgrMon}"><text size="2"/></field>
@@ -79,7 +79,7 @@
             </hyperlink>
         </field>
         <field name="weekNumber" title="${uiLabelMap.ProjectMgrWeekNumber}"><display/></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
         <field name="hours"><display/></field>
@@ -108,7 +108,7 @@
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="1">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="TIMESHEET_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -140,7 +140,7 @@
         </field>
         <field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"/></field>
         <field name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
         <!--field name="comments" title="${uiLabelMap.CommonComments}"><display/></field-->
@@ -184,7 +184,7 @@
         <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
         <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD">
-                <entity-options entity-name="RateType" description="${description}">
+                <entity-options entity-name="RateType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -214,7 +214,7 @@
         <field name="partyId" map-name="userLogin"><hidden/></field>
         <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD" >
-                <entity-options entity-name="RateType" description="${description}">
+                <entity-options entity-name="RateType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -250,7 +250,7 @@
         <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup size="12" target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
         <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down>
-                <entity-options entity-name="RateType" description="${description}">
+                <entity-options entity-name="RateType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -296,7 +296,7 @@
             </hyperlink>
         </field>
         <field name="checkComplete" title="${uiLabelMap.ProjectMgrCheckComplete}"><display/></field>
-        <field name="rateTypeId" title="${uiLabelMap.ProjectMgrRateTypeId}"><display-entity entity-name="RateType" description="${description}"/></field>
+        <field name="rateTypeId" title="${uiLabelMap.ProjectMgrRateTypeId}"><display-entity entity-name="RateType"/></field>
         <field name="d0" parameter-name="hoursDay0" title="${uiLabelMap.ProjectMgrMon}"><display/></field>
         <field name="d1" parameter-name="hoursDay1" title="${uiLabelMap.ProjectMgrTue}"><display/></field>
         <field name="d2" parameter-name="hoursDay2" title="${uiLabelMap.ProjectMgrWen}"><display/></field>
diff --git a/specialpurpose/scrum/widget/CommunicationEventForms.xml b/specialpurpose/scrum/widget/CommunicationEventForms.xml
index e4532853781..929defef380 100644
--- a/specialpurpose/scrum/widget/CommunicationEventForms.xml
+++ b/specialpurpose/scrum/widget/CommunicationEventForms.xml
@@ -66,7 +66,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="statusId">
-            <display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="partyIdFrom" title="${uiLabelMap.CommonFrom}">
             <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView" key-field-name="partyId">
diff --git a/specialpurpose/scrum/widget/FieldLookupForms.xml b/specialpurpose/scrum/widget/FieldLookupForms.xml
index d84b7efe05f..97677804924 100644
--- a/specialpurpose/scrum/widget/FieldLookupForms.xml
+++ b/specialpurpose/scrum/widget/FieldLookupForms.xml
@@ -28,7 +28,7 @@ under the License.
         <field name="description" title="Product Backlog Item"><text-find/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" description="${description}">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" operator="equals" value="CUSTREQ_STTS"/>
                     <entity-order-by field-name="sequenceId"/>
                 </entity-options>
diff --git a/specialpurpose/scrum/widget/MyWorkForms.xml b/specialpurpose/scrum/widget/MyWorkForms.xml
index f84936deac6..525177e51da 100644
--- a/specialpurpose/scrum/widget/MyWorkForms.xml
+++ b/specialpurpose/scrum/widget/MyWorkForms.xml
@@ -30,7 +30,7 @@
                 <parameter param-name="timesheetId"/>
             </hyperlink>
         </field>
-        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
         <field name="hours"><display/></field>
@@ -86,7 +86,7 @@
             </hyperlink>
         </field>
         <field name="checkComplete" title="${uiLabelMap.ScrumCheckComplete}"><display/></field>
-        <field name="rateTypeId" title="${uiLabelMap.ScrumRateTypeId}"><display-entity entity-name="RateType" description="${description}"/></field>
+        <field name="rateTypeId" title="${uiLabelMap.ScrumRateTypeId}"><display-entity entity-name="RateType"/></field>
         <field name="planHours" title="${uiLabelMap.ScrumPlanHours}"><display/></field>
         <field name="d0" parameter-name="hoursDay0" title="${uiLabelMap.ScrumMon}"><display/></field>
         <field name="d1" parameter-name="hoursDay1" title="${uiLabelMap.ScrumTue}"><display/></field>
@@ -131,7 +131,7 @@
         <field name="taskId" title="${uiLabelMap.ScrumTaskName}" parameter-name="workEffortId" encode-output="true">
             <drop-down allow-empty="true" current-description="${result.projectId} ${product.productId} - ${result.projectName}${product.internalName} - ${result.sprintName} - ${groovy:result.backlogName.toString().substring(0,Math.min(result.backlogName.toString().length(),30))}[${result.backlogId}] - ${groovy:result.taskName.toString().substring(0,Math.min(result.taskName.toString().length(),30))}[${result.taskId}]">
                 <list-options key-name="taskId" list-name="taskListDropdown" description="${projectId}${productId} - ${projectName} ${productName} - ${sprintName} - ${groovy: if (description) description.substring(0,Math.min(description.length(),30))} [${custRequestId}] - ${groovy:taskName.substring(0,Math.min(taskName.length(),20))}[${taskId}]"/>
-                <entity-options description="${description}" entity-name="EmplLeaveType" key-field-name="leaveTypeId"/>
+                <entity-options entity-name="EmplLeaveType" key-field-name="leaveTypeId"/>
                 <sub-hyperlink target="taskView" description="${groovy:workEffortId!=void&amp;&amp;!&quot;Totals&quot;.equals(workEffortId)?workEffortId:&quot;&quot;}" target-window="_blank">
                     <parameter param-name="taskId" from-field="workEffortId"/>
                 </sub-hyperlink>
@@ -140,7 +140,7 @@
         <field name="checkComplete" title="${uiLabelMap.ScrumCheckComplete}"><check/></field>
         <field name="rateTypeId" title="${uiLabelMap.ScrumRateTypeId}">
             <drop-down allow-empty="false" no-current-selected-key="${defaultRateTypeId}">
-                <entity-options entity-name="RateType" description="${description}"/>
+                <entity-options entity-name="RateType"/>
             </drop-down>
         </field>
         <field name="planHours" title="${uiLabelMap.ScrumPlanHrs}"><text size="2"/></field>
diff --git a/specialpurpose/scrum/widget/OpenTestForms.xml b/specialpurpose/scrum/widget/OpenTestForms.xml
index f4b79d7908b..e74287960ac 100644
--- a/specialpurpose/scrum/widget/OpenTestForms.xml
+++ b/specialpurpose/scrum/widget/OpenTestForms.xml
@@ -37,7 +37,7 @@
                 <parameter param-name="workEffortId"/>
                 <parameter param-name="productId"/>
             </hyperlink></field>
-        <field name="workEffortTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="WorkEffortType" description="${description}"/></field>
+        <field name="workEffortTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="WorkEffortType"/></field>
         <field name="createdDate" title="${uiLabelMap.FormFieldTitle_createdDate}"><display/></field>
         <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}">
             <display-entity entity-name="PartyNameView" description="${lastName} ${firstName} ${middleName}" key-field-name="partyId"/>
@@ -67,7 +67,7 @@
         <field name="productId" title="${uiLabelMap.ScrumProduct}"><display-entity entity-name="Product" description="${internalName}"></display-entity></field>
         <field name="workEffortTypeId" title="${uiLabelMap.CommonType}">
             <drop-down >
-                <entity-options entity-name="WorkEffortType" description="${description}">
+                <entity-options entity-name="WorkEffortType">
                     <entity-constraint name="parentTypeId" value="SCRUM_TASK"/>
                 </entity-options>
             </drop-down>
@@ -146,7 +146,7 @@
         </field>
         <field name="story"><display description="${story[0].story}"></display> </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" description="${description}"/>
+            <display-entity entity-name="StatusItem"/>
         </field>
     </form>
     <form name="editTask" type="upload" target="createTestTask">
@@ -182,7 +182,7 @@
             <display description="${sprint.workEffortName} [${sprintId}]"/>
         </field>
         <field name="custRequestId" title="${uiLabelMap.ScrumBacklogItem}">
-            <display-entity entity-name="CustRequest" description="${description}">
+            <display-entity entity-name="CustRequest">
                 <sub-hyperlink target="EditProdBacklog"></sub-hyperlink>
             </display-entity>
         </field>
@@ -245,7 +245,7 @@
             <hyperlink target="editDefaultTaskScrum" description="${workEffortName}">
                 <parameter param-name="workEffortId"/>
             </hyperlink></field>
-        <field name="workEffortTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="WorkEffortType" description="${description}"/></field>
+        <field name="workEffortTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="WorkEffortType"/></field>
         <field name="createdDate" title="${uiLabelMap.FormFieldTitle_createdDate}"><display/></field>
         <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}">
             <display-entity entity-name="PartyNameView" description="${lastName} ${firstName} ${middleName}" key-field-name="partyId"/>
@@ -275,7 +275,7 @@
         <!--<field name="productId" title="${uiLabelMap.ScrumProduct}"><display-entity entity-name="Product" description="${internalName}"></display-entity></field>-->
         <field name="workEffortTypeId" title="${uiLabelMap.CommonType}">
             <drop-down >
-                <entity-options entity-name="WorkEffortType" description="${description}">
+                <entity-options entity-name="WorkEffortType">
                     <entity-constraint name="parentTypeId" value="SCRUM_TASK"/>
                 </entity-options>
             </drop-down>
diff --git a/specialpurpose/scrum/widget/ProjectForms.xml b/specialpurpose/scrum/widget/ProjectForms.xml
index 5cd51ec29d7..1bde716b2b8 100644
--- a/specialpurpose/scrum/widget/ProjectForms.xml
+++ b/specialpurpose/scrum/widget/ProjectForms.xml
@@ -48,7 +48,7 @@
         <field use-when="project==null" name="currentStatusId"><hidden value="_NA_"/></field>
         <field entry-name="test" name="roleTypeId" title="${uiLabelMap.PartyRoleType}">
             <drop-down>
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-constraint name="parentTypeId" value="SCRUM_MEMBER"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -83,10 +83,10 @@
             </hyperlink>
         </field>
         <field name="roleTypeId">
-            <display-entity entity-name="RoleType" key-field-name="roleTypeId" description="${description}"/>
+            <display-entity entity-name="RoleType" key-field-name="roleTypeId"/>
         </field>
         <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="priority" widget-area-style="centered"><display description="${Priority}"/></field>
         <field name="estimatedStartDate" widget-area-style="centered"><display type="date"/></field>
diff --git a/specialpurpose/scrum/widget/ResourceForms.xml b/specialpurpose/scrum/widget/ResourceForms.xml
index 990217bb2a8..9e9c30fceda 100644
--- a/specialpurpose/scrum/widget/ResourceForms.xml
+++ b/specialpurpose/scrum/widget/ResourceForms.xml
@@ -44,7 +44,7 @@
         <field name="groupId">
             <drop-down allow-empty="false">
                 <option key="" description=" "/>
-                <list-options list-name="securityGroupList" description="${description}" key-name="groupId"/>
+                <list-options list-name="securityGroupList" key-name="groupId"/>
             </drop-down>
         </field>
         <field name="find" title="${uiLabelMap.CommonFind}"><submit/></field>
@@ -80,9 +80,9 @@
         </field>
         <field name="userLoginId"><display/></field>
         <field name="groupId" sort-field="true">
-            <display-entity entity-name="SecurityGroup" key-field-name="groupId" description="${description}"/>
+            <display-entity entity-name="SecurityGroup" key-field-name="groupId"/>
         </field>
-        <field name="rateTypeId" use-when="rateTypeId!=null"><display-entity entity-name="RateType" description="${description}" key-field-name="rateTypeId"/></field>
+        <field name="rateTypeId" use-when="rateTypeId!=null"><display-entity entity-name="RateType" key-field-name="rateTypeId"/></field>
         <field name="rateAmount" use-when="rateTypeId!=null"><display/></field>
         <field name="percentageUsed" use-when="rateTypeId!=null"><display/></field>
         <field name="update" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext" use-when="rateTypeId!=null">
@@ -144,7 +144,7 @@
         </field>
         <field name="groupId">
             <drop-down allow-empty="false">
-                <list-options list-name="securityGroupList" description="${description}" key-name="groupId"/>
+                <list-options list-name="securityGroupList" key-name="groupId"/>
             </drop-down>
         </field>
         <field name="addButton" ><submit  confirmation-message="Are you sure to add this person ?"/></field>
@@ -152,7 +152,7 @@
     <form name="AddPartyRole" extends="AddPartyRole" extends-resource="component://party/widget/partymgr/PartyForms.xml">
         <field name="roleTypeId">
             <drop-down allow-empty="false">
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-constraint name="parentTypeId" operator="equals" value="SCRUM_MEMBER"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -270,7 +270,7 @@
         </field>
         <field name="roleTypeId">
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="RoleType">
+                <entity-options entity-name="RoleType">
                     <entity-constraint name="parentTypeId" value="SCRUM_MEMBER"/>
                     <entity-order-by field-name="roleTypeId"/>
                 </entity-options>
@@ -333,7 +333,7 @@
         </field>
         <field name="roleTypeId">
             <drop-down current="first-in-list" allow-empty="false" >
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType">
                     <entity-constraint name="parentTypeId" operator="equals" value="SCRUM_MEMBER"/>
                     <entity-constraint name="roleTypeId" operator="not-equals" value="SCRUM_TEAM"/>
                     <entity-constraint name="roleTypeId" operator="not-equals" value="PRODUCT_OWNER_COMP"/>
@@ -371,7 +371,7 @@
             </hyperlink>
         </field>
         <field name="roleTypeId">
-            <display-entity entity-name="RoleType" key-field-name="roleTypeId" description="${description}"/>
+            <display-entity entity-name="RoleType" key-field-name="roleTypeId"/>
         </field>
         <field name="fromDate" sort-field="true">
             <display type="date"/>
@@ -395,7 +395,7 @@
         <field name="partyId"><display/></field>
         <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}"> 
           <drop-down allow-empty="false">
-              <entity-options entity-name="RateType" description="${description}" key-field-name="rateTypeId"></entity-options>
+              <entity-options entity-name="RateType" key-field-name="rateTypeId"></entity-options>
           </drop-down>
         </field>
         <field name="defaultRate">
diff --git a/specialpurpose/scrum/widget/TaskForms.xml b/specialpurpose/scrum/widget/TaskForms.xml
index 4c4afa5b7cc..7452f941dda 100644
--- a/specialpurpose/scrum/widget/TaskForms.xml
+++ b/specialpurpose/scrum/widget/TaskForms.xml
@@ -73,14 +73,14 @@
         <field name="workEffortName" title="${uiLabelMap.ScrumTaskName}" required-field="true" tooltip="${uiLabelMap.ScrumToolTip100CharsMaximun}"><text/></field>
         <field name="workEffortTypeId" title="${uiLabelMap.ScrumTaskType}" required-field="true">
             <drop-down>
-                <entity-options description="${description}" entity-name="WorkEffortType" key-field-name="workEffortTypeId">
+                <entity-options entity-name="WorkEffortType" key-field-name="workEffortTypeId">
                     <entity-constraint name="parentTypeId" value="SCRUM_TASK"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="custRequestId" use-when="task==null" title="${uiLabelMap.ScrumSprintBacklog}">
             <drop-down>
-                <list-options key-name="custRequestId" list-name="scrumProjectSprintBacklogs" description="${description}"/>
+                <list-options key-name="custRequestId" list-name="scrumProjectSprintBacklogs"/>
             </drop-down>
         </field>
         <field name="custRequestId" use-when="task!=null" title="${uiLabelMap.ScrumSprintBacklog}" map-name="parameters">
@@ -134,7 +134,7 @@
         </field>
         <field name="sprintBacklog"><display description="${custRequest.description}"/></field>
         <field name="currentStatusId">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="estimatedHours"><text size="3" default-value="${groovy: if (estimatedMilliSeconds != null) return estimatedMilliSeconds/3600000}"/></field>
         <field name="actualHours"><text size="3" default-value="${groovy: if (actualMilliSeconds != null) return actualMilliSeconds/3600000}"/></field>
@@ -306,12 +306,12 @@
             </service>
         </actions>
         <field name="workEffortName" title="${uiLabelMap.ScrumTaskName}"><display description="${task.workEffortName}"/></field>
-        <field name="workEffortTypeId" title="${uiLabelMap.ScrumTaskType}"><display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" description="${description}"/></field>
+        <field name="workEffortTypeId" title="${uiLabelMap.ScrumTaskType}"><display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId"/></field>
         <field name="sprintName" title="${uiLabelMap.ScrumSprint}"><hidden value="${sprintName}"/></field>
         <field name="projectName" title="${uiLabelMap.ScrumProject}"><hidden value="${projectName}"/></field>
         <field name="custRequestDesp" title="${uiLabelMap.ScrumProductBacklog}"><display description="${description}"/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><hidden value="${task.description}"/></field>
-        <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="planHours"><hidden value="${resultPlanHour.planHours}"/></field>
         <field name="actualHours"><hidden value="${groovy: if (result != null) return result.actualHours}"/></field>
         <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}"><hidden value ="${person.lastName} ${person.firstName}"/></field>
@@ -336,7 +336,7 @@
         <field name="lastName"><display/></field>
         <field name="groupName"><display/></field>
         <field name="roleTypeId">
-            <display-entity entity-name="RoleType" description="${description}"/>
+            <display-entity entity-name="RoleType"/>
         </field>
         <field name="fromDate"><display/></field>
         <field name="thruDate"><display/></field>
@@ -456,7 +456,7 @@
         <field name="workEffortId"><hidden value="${parameters.taskId}"/></field>
         <field name="workEffortTypeId" title="${uiLabelMap.ScrumTaskType}" required-field="true">
             <drop-down>
-                <entity-options description="${description}" entity-name="WorkEffortType" key-field-name="workEffortTypeId">
+                <entity-options entity-name="WorkEffortType" key-field-name="workEffortTypeId">
                     <entity-constraint name="parentTypeId" value="SCRUM_TASK"/>
                 </entity-options>
             </drop-down>
@@ -490,7 +490,7 @@
             </display-entity>
         </field>
         <field name="custRequestId" use-when="task!=null&amp;&amp;project==null" title="${uiLabelMap.ScrumSprintBacklog}" map-name="parameters">
-            <display-entity entity-name="CustRequest" key-field-name="custRequestId" description="${description}">
+            <display-entity entity-name="CustRequest" key-field-name="custRequestId">
                 <sub-hyperlink target="ViewProdBacklogItem" description="[${parameters.custRequestId}]">
                     <parameter param-name="custRequestId" from-field="parameters.custRequestId"/>
                     <parameter param-name="productId" from-field="parameters.projectId"/>
@@ -635,14 +635,14 @@
             </hyperlink>
         </field>
         <field name="taskTypeId" title="${uiLabelMap.ScrumTaskType}" use-when="&quot;SCRUM_TASK_ERROR&quot;.equals(taskTypeId)" widget-style="alert">
-            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" description="${description}"/>
+            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId"/>
         </field>
         <field name="taskTypeId" title="${uiLabelMap.ScrumTaskType}" use-when="!&quot;SCRUM_TASK_ERROR&quot;.equals(taskTypeId)">
-            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" description="${description}"/>
+            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId"/>
         </field>
         <field name="sprintName" title="${uiLabelMap.ScrumSprint}"><display/></field>
         <field name="productBacklogName" entry-name="description" title="${uiLabelMap.ScrumProductBacklog}" ><display/></field>
-        <field name="taskCurrentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+        <field name="taskCurrentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="taskActualStartDate" title="${uiLabelMap.CommonActualStartDate}"><display type="date"/></field>
         <field name="actualHours"><display description="${results.actualHours}"/></field>
         <field name="planHours">
@@ -725,10 +725,10 @@
             </display-entity>
         </field>
         <field name="taskTypeId" >
-            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" description="${description}"/>
+            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId"/>
         </field>
         <field name="taskCurrentStatusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         
         <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}" >
@@ -775,7 +775,7 @@
         <field name="taskName" position="2"><text/></field>
         <field name="taskTypeId" title="Task Type">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="WorkEffortType" key-field-name="workEffortTypeId">
+                <entity-options entity-name="WorkEffortType" key-field-name="workEffortTypeId">
                     <entity-constraint name="parentTypeId" value="SCRUM_TASK"/>
                 </entity-options>
             </drop-down>
@@ -788,7 +788,7 @@
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <list-options key-name="statusId" list-name="statusItemList" description="${description}"/>
+                <list-options key-name="statusId" list-name="statusItemList"/>
             </drop-down>
         </field>
         <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}" position="2">
@@ -921,12 +921,12 @@
         </field>
         <field name="roleTypeId" use-when="parameters.get(&quot;partyId&quot;)!=null&amp;&amp;sprint==null">
             <drop-down current="selected" allow-empty="false">
-                <list-options key-name="roleTypeId" list-name="roleTypeList" description="${description}"/>
+                <list-options key-name="roleTypeId" list-name="roleTypeList"/>
             </drop-down>
         </field>
         <field name="roleTypeId" use-when="parameters.get(&quot;partyId&quot;)!=null&amp;&amp;sprint!=null">
             <drop-down current="selected" allow-empty="false">
-                <entity-options entity-name="WorkEffortPartyAssignAndRoleType" description="${description}">
+                <entity-options entity-name="WorkEffortPartyAssignAndRoleType">
                     <entity-constraint name="partyId" operator="equals" value="${parameters.partyId}"/>
                     <entity-constraint name="workEffortId" operator="equals" value="${sprint.sprintId}"/>
                 </entity-options>
@@ -954,7 +954,7 @@
             </hyperlink>
         </field>
         <field name="roleTypeId">
-            <display-entity entity-name="RoleType" description="${description}"/>
+            <display-entity entity-name="RoleType"/>
         </field>
         <field name="fromDate"><display type="date"/></field>
         <field name="thruDate"><display type="date"/></field>
diff --git a/specialpurpose/scrum/widget/TimeSheetForms.xml b/specialpurpose/scrum/widget/TimeSheetForms.xml
index 9e6b5ba6eec..e1444cc10a0 100644
--- a/specialpurpose/scrum/widget/TimeSheetForms.xml
+++ b/specialpurpose/scrum/widget/TimeSheetForms.xml
@@ -45,7 +45,7 @@
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="1">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="TIMESHEET_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -70,7 +70,7 @@
         </field>
         <field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"/></field>
         <field name="hours" title="${uiLabelMap.ScrumActualHours}"><display/></field>
-        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
         <!--field name="comments" title="${uiLabelMap.CommonComments}"><display/></field-->
@@ -98,7 +98,7 @@
             </hyperlink>
         </field>
         <field name="weekNumber" title="${uiLabelMap.ScrumWeekNumber}"><display/></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
         <field name="hours"><display/></field>
@@ -144,7 +144,7 @@
         <field name="taskId" title="${uiLabelMap.ScrumTaskName}" parameter-name="workEffortId" encode-output="true">
             <drop-down allow-empty="true" current-description="${result.projectId} ${product.productId} - ${result.projectName}${product.internalName} - ${result.sprintName} - ${groovy:result.backlogName.toString().substring(0,Math.min(result.backlogName.toString().length(),30))}[${result.backlogId}] - ${groovy:result.taskName.toString().substring(0,Math.min(result.taskName.toString().length(),30))}[${result.taskId}]">
                 <list-options key-name="taskId" list-name="taskListDropdown" description="${projectId}${productId} - ${projectName} ${productName} - ${sprintName} - ${groovy: if (description) description.substring(0,Math.min(description.length(),30))} [${custRequestId}] - ${groovy:taskName.substring(0,Math.min(taskName.length(),20))}[${taskId}]"/>
-                <entity-options description="${description}" entity-name="EmplLeaveType" key-field-name="leaveTypeId"/>
+                <entity-options entity-name="EmplLeaveType" key-field-name="leaveTypeId"/>
                 <sub-hyperlink target="taskView" description="${groovy:workEffortId!=void&amp;&amp;!&quot;Totals&quot;.equals(workEffortId)?workEffortId:&quot;&quot;}" target-window="_blank">
                     <parameter param-name="taskId" from-field="workEffortId"/>
                 </sub-hyperlink>
@@ -153,7 +153,7 @@
         <field name="checkComplete" title="${uiLabelMap.ScrumCheckComplete}"><check/></field>
         <field name="rateTypeId" title="${uiLabelMap.ScrumRateTypeId}">
             <drop-down allow-empty="false" no-current-selected-key="${defaultRateTypeId}">
-                <entity-options entity-name="RateType" description="${description}"/>
+                <entity-options entity-name="RateType"/>
             </drop-down>
         </field>
         <field name="planHours" title="${uiLabelMap.ScrumPlanHrs}"><text size="2"/></field>
diff --git a/specialpurpose/scrum/widget/scrumForms.xml b/specialpurpose/scrum/widget/scrumForms.xml
index 8c561b3f958..6c4b8e81af3 100644
--- a/specialpurpose/scrum/widget/scrumForms.xml
+++ b/specialpurpose/scrum/widget/scrumForms.xml
@@ -46,7 +46,7 @@ under the License.
                 <parameter param-name="projectId" from-field="projectWorkEffort.workEffortId"/>
             </hyperlink>
         </field>
-        <field name="currentStatusId" title="Current Status"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"></display-entity></field>
+        <field name="currentStatusId" title="Current Status"><display-entity entity-name="StatusItem" key-field-name="statusId"></display-entity></field>
         <field name="actualStartDate" title="Start Date"><display></display></field>
         <field name="actualCompletionDate" title="End Date"><display></display></field>
         <field name="estimatedHours" title="Sprint Length (hours)"><display></display></field>
@@ -162,7 +162,7 @@ under the License.
             </display-entity>
         </field>
         <field name="custRequest.statusId" title="${uiLabelMap.ScrumStatusBacklog}" position="1" use-when="showPosition1&amp;&amp;&quot;Any&quot;.equals(paraBacklogStatusId)">
-            <display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="taskId" title="${uiLabelMap.ScrumTab} ${uiLabelMap.ScrumTask}" position="2" parameter-name="workEffortId" use-when="!&quot;SCRUM_SPRINT&quot;.equals(taskTypeId)">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description=" ">
@@ -175,8 +175,8 @@ under the License.
         <field name="taskTypeId" title="${uiLabelMap.ScrumTab} ${uiLabelMap.ScrumTaskType}" position="2" use-when="!&quot;SCRUM_SPRINT&quot;.equals(taskTypeId)">
             <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" description="${uiLabelMap.ScrumTab} ${description}"/>
         </field>
-        <field name="taskCurrentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="!&quot;STS_COMPLETED&quot;.equals(taskCurrentStatusId)&amp;&amp;!&quot;SCRUM_SPRINT&quot;.equals(taskTypeId)"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field>
-        <field name="taskCurrentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="&quot;STS_COMPLETED&quot;.equals(taskCurrentStatusId)&amp;&amp;!&quot;SCRUM_SPRINT&quot;.equals(taskTypeId)" widget-style="alert"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field>
+        <field name="taskCurrentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="!&quot;STS_COMPLETED&quot;.equals(taskCurrentStatusId)&amp;&amp;!&quot;SCRUM_SPRINT&quot;.equals(taskTypeId)"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+        <field name="taskCurrentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="&quot;STS_COMPLETED&quot;.equals(taskCurrentStatusId)&amp;&amp;!&quot;SCRUM_SPRINT&quot;.equals(taskTypeId)" widget-style="alert"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="dummy1" title=" " position="1" use-when="showPosition1"><display description=" "/></field>
         <field name="dummy2" title=" " position="1" use-when="showPosition1"><display description=" "/></field>
         <field name="dummy3" title=" " position="1" use-when="showPosition1"><display description=" "/></field>
@@ -336,7 +336,7 @@ under the License.
         <field name="statusName"><hidden/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down>
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="SPRINT_STATUS" operator="equals"/>
                 </entity-options>
             </drop-down>
@@ -411,7 +411,7 @@ under the License.
         </field>
         <field name="roleTypeId">
             <drop-down current="selected" allow-empty="false">
-                <entity-options entity-name="PartyRoleDetailAndPartyDetail" description="${description}">
+                <entity-options entity-name="PartyRoleDetailAndPartyDetail">
                     <entity-constraint name="partyId" operator="equals" value="${parameters.partyId}"/>
                     <entity-constraint name="parentTypeId" operator="equals" value="SCRUM_MEMBER"/>
                 </entity-options>
@@ -444,7 +444,7 @@ under the License.
         <field name="workEffortId"><hidden value="${parameters.sprintId}"/></field>
         <field name="memberName" title="${uiLabelMap.ScrumMembersName}"><hyperlink target="viewprofile" description="${lastName}, ${firstName} ${middleName} [${partyId}]"><parameter param-name="partyId"/></hyperlink></field>
         <field name="roleTypeId">
-            <display-entity entity-name="RoleType" description="${description}"/>
+            <display-entity entity-name="RoleType"/>
         </field>
         <field name="fromDate"><display type="date"/></field>
         <field name="thruDate"><display type="date"/></field>
@@ -509,7 +509,7 @@ under the License.
         <field name="description" title="${uiLabelMap.ScrumProjectGoal}"><textarea/></field>
         <field name="currentStatusId" use-when="workEffortId!=null" title="${uiLabelMap.CommonStatus}">
             <drop-down current="first-in-list" current-description="${currentStatus.description}">
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="SCRUM_PROJECT_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -564,7 +564,7 @@ under the License.
         <field name="description" title="${uiLabelMap.ScrumProjectGoal}"><display/></field>
         <field name="billed" title="${uiLabelMap.ScrumBilled}"><display description="${workEffortAttMap.attrValue}"/></field>
         <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="actualStartDate"><display description="${actualStartDate}"/></field>
         <field name="actualCompletionDate"><display type="date"/></field>
@@ -718,7 +718,7 @@ under the License.
             </drop-down>
         </field>
         <field name="custRequestTypeId" title="${uiLabelMap.ScrumUnplanBacklog}" use-when="custRequest!=null&amp;&amp;isTeamMember==true">
-            <display-entity entity-name="CustRequestType" description="${description}" key-field-name="custRequestTypeId"/>
+            <display-entity entity-name="CustRequestType" key-field-name="custRequestTypeId"/>
         </field>
         <field name="unplannedFlag" title="${uiLabelMap.ScrumUnplanBacklog}" use-when="custRequest==null">
             <drop-down allow-empty="false" no-current-selected-key="N">
@@ -727,7 +727,7 @@ under the License.
             </drop-down>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" use-when="custRequest!=null">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"></display-entity>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"></display-entity>
         </field>
         <field name="partyIdTo" title="${uiLabelMap.ScrumRequestName}" parameter-name="partyIdTo" use-when="custRequest!=null&amp;&amp;isTeamMember==false">
             <drop-down no-current-selected-key="${custRequest.fromPartyId}" allow-empty="false">
@@ -821,7 +821,7 @@ under the License.
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
             <drop-down allow-empty="false">
                 <option key="${uiLabelMap.CommonAny}" description=" "/>
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="CUSTREQ_STTS"/>
                     <entity-constraint name="statusId" operator="not-equals" value="CRQ_PENDING"/>
                     <entity-constraint name="statusId" operator="not-equals" value="CRQ_REJECTED"/>
@@ -880,7 +880,7 @@ under the License.
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="false">
                 <option key="${uiLabelMap.CommonAny}" description=" "/>
-                <entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
+                <entity-options entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" value="CUSTREQ_STTS"/>
                     <entity-constraint name="statusId" operator="not-equals" value="CRQ_PENDING"/>
                     <entity-constraint name="statusId" operator="not-equals" value="CRQ_REJECTED"/>
@@ -1232,7 +1232,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="sprintCurrentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="&quot;${sprintId}&quot;!=&quot;&quot;">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="estimatedHrs" title="${uiLabelMap.ScrumSprintLengthWeeks}" position="2" use-when="&quot;${sprintId}&quot;!=&quot;&quot;"><display/></field>
         <field name="planHours" title="${uiLabelMap.ScrumPlannedHours}" position="2" use-when="&quot;${sprintId}&quot;!=&quot;&quot;"><display/></field>
@@ -1304,7 +1304,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="sprintCurrentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="&quot;${sprintId}&quot;!=&quot;&quot;">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="estimatedHrs" title="${uiLabelMap.ScrumSprintLengthWeeks}" position="2" use-when="&quot;${sprintId}&quot;!=&quot;&quot;"><display/></field>
         <field name="planHours" title="${uiLabelMap.ScrumPlannedHours}" position="2" use-when="&quot;${sprintId}&quot;!=&quot;&quot;"><display/></field>
@@ -1482,7 +1482,7 @@ under the License.
         </field> 
         <field name="statusId" title="${uiLabelMap.CommonStatus}" use-when="product!=null">
             <drop-down>
-                <entity-options description="${description}" entity-name="StatusItem">
+                <entity-options entity-name="StatusItem">
                     <entity-constraint name="statusTypeId" value="PRODUCT_STATUS"/>
                 </entity-options>
             </drop-down>
@@ -1547,7 +1547,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" use-when="product!=null" map-name="statusMap">
-            <display-entity entity-name="StatusItem" description="${description}"/>
+            <display-entity entity-name="StatusItem"/>
         </field>
         <field name="internalName" title="${uiLabelMap.ScrumProductName}"><display description="${product.internalName} [${product.productId}]"/></field>
         <field name="longDescription" title="${uiLabelMap.CommonDescription}"><display /></field>
@@ -1691,7 +1691,7 @@ under the License.
             <field name="statusId" parameter-name="statusId">
                 <drop-down allow-empty="false">
                     <option key="Any" description="${uiLabelMap.CommonAny}"/>
-                    <entity-options entity-name="StatusItem" description="${description}">
+                    <entity-options entity-name="StatusItem">
                         <entity-constraint name="statusTypeId" operator="equals" value="PRODUCT_STATUS"/>
                     </entity-options>
                 </drop-down>
@@ -1834,7 +1834,7 @@ under the License.
                 <parameter param-name="timesheetId"/>
             </hyperlink>
         </field>
-        <field name="rateTypeId" title="${uiLabelMap.ScrumRateTypeId}" position="2"><display-entity entity-name="RateType" description="${description}"/></field>
+        <field name="rateTypeId" title="${uiLabelMap.ScrumRateTypeId}" position="2"><display-entity entity-name="RateType"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonDate}" position="2"><display type="date"/> </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
@@ -2000,7 +2000,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
-            <display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="custRequestCategoryGroupId" position="1" use-when="${groovy:showPosition1==true&amp;&amp;sequence.equals(&quot;N&quot;)}" title="${uiLabelMap.ScrumCategory}" widget-style="h3">
             <display-entity entity-name="CustRequest" key-field-name="custRequestId" description="${custRequestName}"/>
@@ -2040,7 +2040,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
-            <display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="parentCustRequestId" position="2" title="${uiLabelMap.ScrumCategory}">
             <display-entity entity-name="CustRequest" description="${custRequestName}" key-field-name="custRequestId"/>
@@ -2121,17 +2121,17 @@ under the License.
             </hyperlink>
         </field>
         <field name="custRequestId" title="${uiLabelMap.ScrumSprintBacklog}">
-            <display-entity entity-name="CustRequest" key-field-name="custRequestId" description="${description}">
+            <display-entity entity-name="CustRequest" key-field-name="custRequestId">
                 <sub-hyperlink target="ViewProdBacklogItem" description="[${custRequestId}]">
                     <parameter param-name="custRequestId"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
         <field name="taskTypeId" title="${uiLabelMap.ScrumTaskType}">
-            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" description="${description}"/>
+            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId"/>
         </field>
         <field name="taskCurrentStatusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}">
             <drop-down allow-empty="true" no-current-selected-key="${partyId}">
@@ -2240,7 +2240,7 @@ under the License.
         <field name="taskName"><text/></field>
         <field name="taskTypeId" title="${uiLabelMap.ScrumTaskType}">
             <drop-down allow-empty="true">
-                <entity-options description="${description}" entity-name="WorkEffortType" key-field-name="workEffortTypeId">
+                <entity-options entity-name="WorkEffortType" key-field-name="workEffortTypeId">
                     <entity-constraint name="parentTypeId" value="SCRUM_TASK"/>
                 </entity-options>
             </drop-down>
@@ -2419,7 +2419,7 @@ under the License.
         <field name="productId"><hidden/></field>
         <field name="name"><hidden/></field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" description="${description}"/>
+            <display-entity entity-name="StatusItem"/>
         </field>
         <field name="companyNameId" title="${uiLabelMap.ScrumOwnerCompany}" use-when="!isCurrentCompany">
             <hyperlink target="viewprofile" description="${resultCompanyGroup.groupName} [${companyNameId}]">
@@ -2477,10 +2477,10 @@ under the License.
         </hyperlink>
    </field>
    <field name="taskTypeId" title="Task Type">
-        <display-entity entity-name="WorkEffortType" description="${description}" key-field-name="workEffortTypeId"></display-entity>
+        <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId"></display-entity>
    </field> 
    <field name="taskCurrentStatusId" title="Status">
-        <display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/>
+        <display-entity entity-name="StatusItem" key-field-name="statusId"/>
    </field>
    <field name="taskActualCompletionDate" title="Completion Date"><display/></field>
    </form>
@@ -2542,12 +2542,12 @@ under the License.
         <field name="workEffortContentTypeId"><hidden value="PROJECT_SPEC"/></field>
         <field name="contentTypeId">
             <drop-down allow-empty="false" no-current-selected-key="DOCUMENT">
-                <entity-options description="${description}" entity-name="ContentType"/>
+                <entity-options entity-name="ContentType"/>
             </drop-down>
         </field>
         <field name="mimeTypeId" >
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="MimeType" key-field-name="mimeTypeId"/>
+                <entity-options entity-name="MimeType" key-field-name="mimeTypeId"/>
             </drop-down>
         </field>
         <field name="dataResourceName" title="${uiLabelMap.CommonUpload}"><file/></field>
@@ -2560,7 +2560,7 @@ under the License.
                 <field-map field-name="workEffortId" from-field="workEffortId"/>
             </entity-and>
         </actions>
-        <field name="contentTypeId"><display-entity entity-name="ContentType" description="${description}"/></field>
+        <field name="contentTypeId"><display-entity entity-name="ContentType"/></field>
         <field name="contentName" widget-style="buttontext">
             <display description="${contentName}[${contentId}]"/>
         </field>
@@ -2664,14 +2664,14 @@ under the License.
         <field name="custRequestId" map-name="parameters"><hidden/></field>
         <field name="contentTypeId">
             <drop-down allow-empty="false" no-current-selected-key="DOCUMENT">
-                <entity-options description="${description}" entity-name="ContentType">
+                <entity-options entity-name="ContentType">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
         <field name="mimeTypeId" >
             <drop-down allow-empty="false">
-                <entity-options description="${description}" entity-name="MimeType" key-field-name="mimeTypeId"/>
+                <entity-options entity-name="MimeType" key-field-name="mimeTypeId"/>
             </drop-down>
         </field>
         <field name="dataResourceName" title="${uiLabelMap.CommonUpload}*"><file/></field>
@@ -2773,10 +2773,10 @@ under the License.
             </hyperlink>
         </field>
         <field name="taskTypeId" title="${uiLabelMap.ScrumTaskType}">
-            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" description="${description}"/>
+            <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId"/>
         </field>
         <field name="taskCurrentStatusId" title="${uiLabelMap.CommonStatus}">
-            <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}">
             <display-entity entity-name="Person" description="${lastName} ${firstName} ${middleName}" key-field-name="partyId"/>
@@ -2892,7 +2892,7 @@ under the License.
         <field name="workEffortName" title="${uiLabelMap.ScrumTaskName}" required-field="true" tooltip="${uiLabelMap.ScrumToolTip100CharsMaximun}"><text/></field>
         <field name="workEffortTypeId" title="${uiLabelMap.ScrumTaskType}" required-field="true">
             <drop-down>
-                <entity-options description="${description}" entity-name="WorkEffortType" key-field-name="workEffortTypeId">
+                <entity-options entity-name="WorkEffortType" key-field-name="workEffortTypeId">
                     <entity-constraint name="parentTypeId" value="SCRUM_TASK"/>
                 </entity-options>
             </drop-down>
@@ -3021,7 +3021,7 @@ under the License.
             </display-entity>
         </field>
         <field name="statusId" title="${uiLabelMap.ScrumStatusBacklog}" position="1" use-when="showPosition1&amp;&amp;&quot;Any&quot;.equals(paraBacklogStatusId)">
-            <display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/>
+            <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>
         <field name="workEffortId" title="${uiLabelMap.ScrumTab} ${uiLabelMap.ScrumTask}" position="2" use-when="workEffortId!=null">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description=" ">
@@ -3033,8 +3033,8 @@ under the License.
         <field name="workEffortTypeId" title="${uiLabelMap.ScrumTab} ${uiLabelMap.ScrumTaskType}" position="2" use-when="workEffortId!=null">
             <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" description="${uiLabelMap.ScrumTab} ${description}"/>
         </field>
-        <field name="currentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="!&quot;STS_COMPLETED&quot;.equals(currentStatusId)"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field>
-        <field name="currentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="&quot;STS_COMPLETED&quot;.equals(currentStatusId)" widget-style="alert"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field>
+        <field name="currentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="!&quot;STS_COMPLETED&quot;.equals(currentStatusId)"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+        <field name="currentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="&quot;STS_COMPLETED&quot;.equals(currentStatusId)" widget-style="alert"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="dummy1" title=" " position="1" use-when="showPosition1"><display description=" "/></field>
         <field name="dummy2" title=" " position="1" use-when="showPosition1"><display description=" "/></field>
         <field name="dummy3" title=" " position="1" use-when="showPosition1"><display description=" "/></field>