From 427c232eae827eed1021b9641f2c7336feaf290f Mon Sep 17 00:00:00 2001
From: UladzislauKutarkin
 <72550466+UladzislauKutarkin@users.noreply.github.com>
Date: Mon, 12 Aug 2024 12:42:17 +0400
Subject: [PATCH] UIORGS-425: Use Save & close button label stripes-component
 translation key  (#637)

---
 CHANGELOG.md                                  |  1 +
 .../OrganizationIntegrationForm.js            |  2 +-
 .../OrganizationIntegrationForm.test.js.snap  |  2 +-
 .../OrganizationAccounts.test.js              | 10 +-
 .../OrganizationAccounts.test.js.snap         |  1 +
 .../OrganizationSummary.test.js               | 35 ++++---
 .../OrganizationAccountsForm.test.js          | 13 ++-
 .../OrganizationAccountsForm.test.js.snap     | 14 +--
 .../OrganizationContactInfoForm.test.js.snap  | 87 ++++++++++------
 .../OrganizationForm/OrganizationForm.js      |  2 +-
 .../OrganizationSummaryForm.test.js           | 13 ++-
 .../OrganizationSummaryForm.test.js.snap      | 34 ++++---
 .../OrganizationVendorInfoForm.test.js.snap   | 15 +--
 .../OrganizationForm.test.js.snap             |  6 +-
 src/contacts/EditContact/EditContact.js       |  2 +-
 .../__snapshots__/EditContact.test.js.snap    | 99 +++++++++++++------
 translations/ui-organizations/en.json         |  1 -
 17 files changed, 215 insertions(+), 122 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e7aa473..d4a39618 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 * UX Consistency: HTML Page Title display when the third pane (detail record) displays. Refs UIORGS-423.
 * Settings > Organizations > Banking information is not properly fenced off by permissions. Refs UIORGS-436.
+* Use Save & close button label stripes-component translation key - all UI modules. Refs UIORGS-425.
 
 ## [5.1.1](https://github.com/folio-org/ui-organizations/tree/v5.1.1) (2024-04-18)
 [Full Changelog](https://github.com/folio-org/ui-organizations/compare/v5.1.0...v5.1.1)
diff --git a/src/OrganizationIntegration/OrganizationIntegrationForm/OrganizationIntegrationForm.js b/src/OrganizationIntegration/OrganizationIntegrationForm/OrganizationIntegrationForm.js
index c009bc29..c2b7561c 100644
--- a/src/OrganizationIntegration/OrganizationIntegrationForm/OrganizationIntegrationForm.js
+++ b/src/OrganizationIntegration/OrganizationIntegrationForm/OrganizationIntegrationForm.js
@@ -55,7 +55,7 @@ const OrganizationIntegrationForm = ({
           disabled={pristine || submitting}
           onClick={handleSubmit}
         >
-          <FormattedMessage id="ui-organizations.button.saveAndClose" />
+          <FormattedMessage id="stripes-components.saveAndClose" />
         </Button>
       );
 
diff --git a/src/OrganizationIntegration/OrganizationIntegrationForm/__snapshots__/OrganizationIntegrationForm.test.js.snap b/src/OrganizationIntegration/OrganizationIntegrationForm/__snapshots__/OrganizationIntegrationForm.test.js.snap
index b113b6d8..a3374648 100644
--- a/src/OrganizationIntegration/OrganizationIntegrationForm/__snapshots__/OrganizationIntegrationForm.test.js.snap
+++ b/src/OrganizationIntegration/OrganizationIntegrationForm/__snapshots__/OrganizationIntegrationForm.test.js.snap
@@ -1486,7 +1486,7 @@ exports[`OrganizationIntegrationForm should render correct form structure 1`] =
               <span
                 class="inner"
               >
-                ui-organizations.button.saveAndClose
+                stripes-components.saveAndClose
               </span>
             </button>
           </span>
diff --git a/src/Organizations/OrganizationDetails/OrganizationAccounts/OrganizationAccounts.test.js b/src/Organizations/OrganizationDetails/OrganizationAccounts/OrganizationAccounts.test.js
index c05393fe..347e604b 100644
--- a/src/Organizations/OrganizationDetails/OrganizationAccounts/OrganizationAccounts.test.js
+++ b/src/Organizations/OrganizationDetails/OrganizationAccounts/OrganizationAccounts.test.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import { render } from '@folio/jest-config-stripes/testing-library/react';
 
+import { QueryClient, QueryClientProvider } from 'react-query';
 import OrganizationAccounts from './OrganizationAccounts';
 
 jest.mock('@folio/stripes-components/lib/NoValue', () => {
@@ -18,10 +19,13 @@ const accounts = [{
   libraryEdiCode: 'ECDA',
   notes: 'Default account',
 }];
+const queryClient = new QueryClient();
 const renderOrganizationAccounts = () => render(
-  <OrganizationAccounts
-    accounts={accounts}
-  />,
+  <QueryClientProvider client={queryClient}>
+    <OrganizationAccounts
+      accounts={accounts}
+    />,
+  </QueryClientProvider>,
 );
 
 describe('OrganizationAccounts', () => {
diff --git a/src/Organizations/OrganizationDetails/OrganizationAccounts/__snapshots__/OrganizationAccounts.test.js.snap b/src/Organizations/OrganizationDetails/OrganizationAccounts/__snapshots__/OrganizationAccounts.test.js.snap
index b358f210..0ea49c0b 100644
--- a/src/Organizations/OrganizationDetails/OrganizationAccounts/__snapshots__/OrganizationAccounts.test.js.snap
+++ b/src/Organizations/OrganizationDetails/OrganizationAccounts/__snapshots__/OrganizationAccounts.test.js.snap
@@ -209,5 +209,6 @@ exports[`OrganizationAccounts should render correct structure 1`] = `
       </div>
     </div>
   </div>
+  ,
 </DocumentFragment>
 `;
diff --git a/src/Organizations/OrganizationDetails/OrganizationSummary/OrganizationSummary.test.js b/src/Organizations/OrganizationDetails/OrganizationSummary/OrganizationSummary.test.js
index e6ba9692..6e24e96c 100644
--- a/src/Organizations/OrganizationDetails/OrganizationSummary/OrganizationSummary.test.js
+++ b/src/Organizations/OrganizationDetails/OrganizationSummary/OrganizationSummary.test.js
@@ -4,6 +4,7 @@ import { IntlProvider } from 'react-intl';
 
 import '@folio/stripes-acq-components/test/jest/__mock__';
 
+import { QueryClient, QueryClientProvider } from 'react-query';
 import OrganizationSummary from './OrganizationSummary';
 
 const STUB_ORG = {
@@ -52,22 +53,26 @@ const messages = {
   'stripes-components.noValue.noValueSet': 'noValueSet',
 };
 
+const queryClient = new QueryClient();
+
 const renderOrganizationSummary = (organization) => (render(
-  <IntlProvider locale="en" messages={messages}>
-    <OrganizationSummary
-      acqUnitIds={organization.acqUnitIds}
-      aliases={organization.aliases}
-      code={organization.code}
-      description={organization.description}
-      erpCode={organization.erpCode}
-      isVendor={organization.isVendor}
-      language={organization.language}
-      metadata={organization.metadata}
-      name={organization.name}
-      status={organization.status}
-      organizationTypes={organization.organizationTypes}
-    />
-  </IntlProvider>,
+  <QueryClientProvider client={queryClient}>
+    <IntlProvider locale="en" messages={messages}>
+      <OrganizationSummary
+        acqUnitIds={organization.acqUnitIds}
+        aliases={organization.aliases}
+        code={organization.code}
+        description={organization.description}
+        erpCode={organization.erpCode}
+        isVendor={organization.isVendor}
+        language={organization.language}
+        metadata={organization.metadata}
+        name={organization.name}
+        status={organization.status}
+        organizationTypes={organization.organizationTypes}
+      />
+    </IntlProvider>,
+  </QueryClientProvider>,
 ));
 
 describe('OrganizationSummary component', () => {
diff --git a/src/Organizations/OrganizationForm/OrganizationAccountsForm/OrganizationAccountsForm.test.js b/src/Organizations/OrganizationForm/OrganizationAccountsForm/OrganizationAccountsForm.test.js
index 73bf74d9..00a55d54 100644
--- a/src/Organizations/OrganizationForm/OrganizationAccountsForm/OrganizationAccountsForm.test.js
+++ b/src/Organizations/OrganizationForm/OrganizationAccountsForm/OrganizationAccountsForm.test.js
@@ -4,6 +4,7 @@ import { MemoryRouter } from 'react-router-dom';
 
 import stripesFinalForm from '@folio/stripes/final-form';
 
+import { QueryClient, QueryClientProvider } from 'react-query';
 import OrganizationAccountsForm from './OrganizationAccountsForm';
 
 const TestForm = stripesFinalForm({})(
@@ -29,11 +30,15 @@ const account = {
   notes: '',
   paymentMethod: 'Credit Card',
 };
+const queryClient = new QueryClient();
+
 const renderForm = ({ initialValues = {} } = {}) => render(
-  <TestForm
-    onSubmit={jest.fn()}
-    initialValues={initialValues}
-  />,
+  <QueryClientProvider client={queryClient}>
+    <TestForm
+      onSubmit={jest.fn()}
+      initialValues={initialValues}
+    />
+  </QueryClientProvider>,
   { wrapper: MemoryRouter },
 );
 
diff --git a/src/Organizations/OrganizationForm/OrganizationAccountsForm/__snapshots__/OrganizationAccountsForm.test.js.snap b/src/Organizations/OrganizationForm/OrganizationAccountsForm/__snapshots__/OrganizationAccountsForm.test.js.snap
index 12dddefb..f11d1616 100644
--- a/src/Organizations/OrganizationForm/OrganizationAccountsForm/__snapshots__/OrganizationAccountsForm.test.js.snap
+++ b/src/Organizations/OrganizationForm/OrganizationAccountsForm/__snapshots__/OrganizationAccountsForm.test.js.snap
@@ -453,8 +453,8 @@ exports[`OrganizationAccountsForm should render correct structure with defined a
                 />
                 <label
                   class="label"
-                  for="downshift-:r1:-input"
-                  id="multiselect-label-id-account-acq-units-0"
+                  for="account-acq-units-0-input"
+                  id="account-acq-units-0-label"
                 >
                   stripes-acq-components.label.acqUnits
                 </label>
@@ -475,7 +475,7 @@ exports[`OrganizationAccountsForm should render correct structure with defined a
                 >
                   <div
                     aria-describedby="multi-describe-control-account-acq-units-0"
-                    aria-labelledby="multiselect-label-id-account-acq-units-0 multi-value-status-account-acq-units-0"
+                    aria-labelledby="account-acq-units-0-label multi-value-status-account-acq-units-0"
                     class="multiSelectControl formControl"
                     role="searchbox"
                     tabindex="0"
@@ -488,7 +488,7 @@ exports[`OrganizationAccountsForm should render correct structure with defined a
                         aria-autocomplete="list"
                         aria-controls="multiselect-option-list-account-acq-units-0"
                         aria-expanded="false"
-                        aria-labelledby="multiselect-label-id-account-acq-units-0"
+                        aria-labelledby="account-acq-units-0-label"
                         autocomplete="off"
                         class="multiSelectFilterField"
                         id="account-acq-units-0-input"
@@ -507,7 +507,7 @@ exports[`OrganizationAccountsForm should render correct structure with defined a
                     <button
                       aria-controls="multiselect-option-list-account-acq-units-0"
                       aria-expanded="false"
-                      aria-label="toggle menu"
+                      aria-label="stripes-components.multiSelection.dropdownTriggerLabel"
                       class="multiSelectToggleButton"
                       id="downshift-:r1:-toggle-button"
                       tabindex="-1"
@@ -525,7 +525,7 @@ exports[`OrganizationAccountsForm should render correct structure with defined a
                   <div
                     class="multiSelectMenu"
                     hidden=""
-                    style="width: 100%;"
+                    style="width: 100px;"
                   >
                     <div
                       class="multiSelectFeedback"
@@ -538,7 +538,7 @@ exports[`OrganizationAccountsForm should render correct structure with defined a
                       </div>
                     </div>
                     <ul
-                      aria-labelledby="multiselect-label-id-account-acq-units-0"
+                      aria-labelledby="account-acq-units-0-label"
                       class="multiSelectOptionList"
                       id="multiselect-option-list-account-acq-units-0"
                       role="listbox"
diff --git a/src/Organizations/OrganizationForm/OrganizationContactInfoForm/__snapshots__/OrganizationContactInfoForm.test.js.snap b/src/Organizations/OrganizationForm/OrganizationContactInfoForm/__snapshots__/OrganizationContactInfoForm.test.js.snap
index 01be5a59..cfeba792 100644
--- a/src/Organizations/OrganizationForm/OrganizationContactInfoForm/__snapshots__/OrganizationContactInfoForm.test.js.snap
+++ b/src/Organizations/OrganizationForm/OrganizationContactInfoForm/__snapshots__/OrganizationContactInfoForm.test.js.snap
@@ -275,14 +275,21 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                               aria-labelledby="sl-label-selection-:r0: selected-selection-:r0:-item"
                               class="selectionControl formControl"
                               id="selection-:r0:"
+                              name="addresses[0].country"
                               type="button"
+                              value="USA"
                             >
                               <span
                                 class="sr-only"
                               >
                                 stripes-components.selection.controlLabel
                               </span>
-                              US
+                              <div
+                                class="singleValue"
+                                id="selected-selection-:r0:-item"
+                              >
+                                US
+                              </div>
                             </button>
                             <div
                               class="selectionEndControls"
@@ -3578,6 +3585,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                               aria-labelledby="sl-label-selection-:r2: selected-selection-:r2:-item"
                               class="selectionControl formControl"
                               id="selection-:r2:"
+                              name="addresses[0].language"
                               type="button"
                             >
                               <span
@@ -3585,6 +3593,10 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                               >
                                 stripes-components.selection.controlLabel
                               </span>
+                              <div
+                                class="singleValue"
+                                id="selected-selection-:r2:-item"
+                              />
                             </button>
                             <div
                               class="selectionEndControls"
@@ -9983,8 +9995,8 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                           />
                           <label
                             class="label"
-                            for="downshift-:r5:-input"
-                            id="multiselect-label-id-multiselect-:r4:"
+                            for="multiselect-:r4:-input"
+                            id="multiselect-:r4:-label"
                           >
                             ui-organizations.data.contactTypes.categories
                           </label>
@@ -10005,7 +10017,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                           >
                             <div
                               aria-describedby="multi-describe-control-multiselect-:r4:"
-                              aria-labelledby="multiselect-label-id-multiselect-:r4: multi-value-status-multiselect-:r4:"
+                              aria-labelledby="multiselect-:r4:-label multi-value-status-multiselect-:r4:"
                               class="multiSelectControl formControl"
                               role="searchbox"
                               tabindex="0"
@@ -10079,10 +10091,11 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                                   aria-autocomplete="list"
                                   aria-controls="multiselect-option-list-multiselect-:r4:"
                                   aria-expanded="false"
-                                  aria-labelledby="multiselect-label-id-multiselect-:r4:"
+                                  aria-labelledby="addressFormCategoriesLabel"
                                   autocomplete="off"
                                   class="multiSelectFilterField"
                                   id="multiselect-:r4:-input"
+                                  placeholder=""
                                   role="combobox"
                                   type="text"
                                   value=""
@@ -10098,7 +10111,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                               <button
                                 aria-controls="multiselect-option-list-multiselect-:r4:"
                                 aria-expanded="false"
-                                aria-label="toggle menu"
+                                aria-label="stripes-components.multiSelection.dropdownTriggerLabel"
                                 class="multiSelectToggleButton"
                                 id="downshift-:r5:-toggle-button"
                                 tabindex="-1"
@@ -10116,14 +10129,14 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                             <div
                               class="multiSelectMenu"
                               hidden=""
-                              style="width: 100%;"
+                              style="width: 100px;"
                             >
                               <div
                                 class="multiSelectFeedback"
                                 role="alert"
                               />
                               <ul
-                                aria-labelledby="multiselect-label-id-multiselect-:r4:"
+                                aria-labelledby="multiselect-:r4:-label"
                                 class="multiSelectOptionList"
                                 id="multiselect-option-list-multiselect-:r4:"
                                 role="listbox"
@@ -10399,6 +10412,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                               aria-labelledby="sl-label-selection-:r6: selected-selection-:r6:-item"
                               class="selectionControl formControl"
                               id="selection-:r6:"
+                              name="phoneNumbers[0].language"
                               type="button"
                             >
                               <span
@@ -10406,6 +10420,10 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                               >
                                 stripes-components.selection.controlLabel
                               </span>
+                              <div
+                                class="singleValue"
+                                id="selected-selection-:r6:-item"
+                              />
                             </button>
                             <div
                               class="selectionEndControls"
@@ -16804,8 +16822,8 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                           />
                           <label
                             class="label"
-                            for="downshift-:r9:-input"
-                            id="multiselect-label-id-multiselect-:r8:"
+                            for="multiselect-:r8:-input"
+                            id="multiselect-:r8:-label"
                           >
                             ui-organizations.data.contactTypes.categories
                           </label>
@@ -16826,7 +16844,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                           >
                             <div
                               aria-describedby="multi-describe-control-multiselect-:r8:"
-                              aria-labelledby="multiselect-label-id-multiselect-:r8: multi-value-status-multiselect-:r8:"
+                              aria-labelledby="multiselect-:r8:-label multi-value-status-multiselect-:r8:"
                               class="multiSelectControl formControl"
                               role="searchbox"
                               tabindex="0"
@@ -16839,7 +16857,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                                   aria-autocomplete="list"
                                   aria-controls="multiselect-option-list-multiselect-:r8:"
                                   aria-expanded="false"
-                                  aria-labelledby="multiselect-label-id-multiselect-:r8:"
+                                  aria-labelledby="phoneFormCategoriesLabel"
                                   autocomplete="off"
                                   class="multiSelectFilterField"
                                   id="multiselect-:r8:-input"
@@ -16858,7 +16876,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                               <button
                                 aria-controls="multiselect-option-list-multiselect-:r8:"
                                 aria-expanded="false"
-                                aria-label="toggle menu"
+                                aria-label="stripes-components.multiSelection.dropdownTriggerLabel"
                                 class="multiSelectToggleButton"
                                 id="downshift-:r9:-toggle-button"
                                 tabindex="-1"
@@ -16876,14 +16894,14 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                             <div
                               class="multiSelectMenu"
                               hidden=""
-                              style="width: 100%;"
+                              style="width: 100px;"
                             >
                               <div
                                 class="multiSelectFeedback"
                                 role="alert"
                               />
                               <ul
-                                aria-labelledby="multiselect-label-id-multiselect-:r8:"
+                                aria-labelledby="multiselect-:r8:-label"
                                 class="multiSelectOptionList"
                                 id="multiselect-option-list-multiselect-:r8:"
                                 role="listbox"
@@ -17134,6 +17152,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                               aria-labelledby="sl-label-selection-:ra: selected-selection-:ra:-item"
                               class="selectionControl formControl"
                               id="selection-:ra:"
+                              name="emails[0].language"
                               type="button"
                             >
                               <span
@@ -17141,6 +17160,10 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                               >
                                 stripes-components.selection.controlLabel
                               </span>
+                              <div
+                                class="singleValue"
+                                id="selected-selection-:ra:-item"
+                              />
                             </button>
                             <div
                               class="selectionEndControls"
@@ -23539,8 +23562,8 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                           />
                           <label
                             class="label"
-                            for="downshift-:rd:-input"
-                            id="multiselect-label-id-multiselect-:rc:"
+                            for="multiselect-:rc:-input"
+                            id="multiselect-:rc:-label"
                           >
                             ui-organizations.data.contactTypes.categories
                           </label>
@@ -23561,7 +23584,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                           >
                             <div
                               aria-describedby="multi-describe-control-multiselect-:rc:"
-                              aria-labelledby="multiselect-label-id-multiselect-:rc: multi-value-status-multiselect-:rc:"
+                              aria-labelledby="multiselect-:rc:-label multi-value-status-multiselect-:rc:"
                               class="multiSelectControl formControl"
                               role="searchbox"
                               tabindex="0"
@@ -23574,7 +23597,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                                   aria-autocomplete="list"
                                   aria-controls="multiselect-option-list-multiselect-:rc:"
                                   aria-expanded="false"
-                                  aria-labelledby="multiselect-label-id-multiselect-:rc:"
+                                  aria-labelledby="emailFormCategoriesLabel"
                                   autocomplete="off"
                                   class="multiSelectFilterField"
                                   id="multiselect-:rc:-input"
@@ -23593,7 +23616,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                               <button
                                 aria-controls="multiselect-option-list-multiselect-:rc:"
                                 aria-expanded="false"
-                                aria-label="toggle menu"
+                                aria-label="stripes-components.multiSelection.dropdownTriggerLabel"
                                 class="multiSelectToggleButton"
                                 id="downshift-:rd:-toggle-button"
                                 tabindex="-1"
@@ -23611,14 +23634,14 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                             <div
                               class="multiSelectMenu"
                               hidden=""
-                              style="width: 100%;"
+                              style="width: 100px;"
                             >
                               <div
                                 class="multiSelectFeedback"
                                 role="alert"
                               />
                               <ul
-                                aria-labelledby="multiselect-label-id-multiselect-:rc:"
+                                aria-labelledby="multiselect-:rc:-label"
                                 class="multiSelectOptionList"
                                 id="multiselect-option-list-multiselect-:rc:"
                                 role="listbox"
@@ -23869,6 +23892,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                               aria-labelledby="sl-label-selection-:re: selected-selection-:re:-item"
                               class="selectionControl formControl"
                               id="selection-:re:"
+                              name="urls[0].language"
                               type="button"
                             >
                               <span
@@ -23876,6 +23900,10 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                               >
                                 stripes-components.selection.controlLabel
                               </span>
+                              <div
+                                class="singleValue"
+                                id="selected-selection-:re:-item"
+                              />
                             </button>
                             <div
                               class="selectionEndControls"
@@ -30274,8 +30302,8 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                           />
                           <label
                             class="label"
-                            for="downshift-:rh:-input"
-                            id="multiselect-label-id-multiselect-:rg:"
+                            for="multiselect-:rg:-input"
+                            id="multiselect-:rg:-label"
                           >
                             ui-organizations.data.contactTypes.categories
                           </label>
@@ -30296,7 +30324,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                           >
                             <div
                               aria-describedby="multi-describe-control-multiselect-:rg:"
-                              aria-labelledby="multiselect-label-id-multiselect-:rg: multi-value-status-multiselect-:rg:"
+                              aria-labelledby="multiselect-:rg:-label multi-value-status-multiselect-:rg:"
                               class="multiSelectControl formControl"
                               role="searchbox"
                               tabindex="0"
@@ -30370,10 +30398,11 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                                   aria-autocomplete="list"
                                   aria-controls="multiselect-option-list-multiselect-:rg:"
                                   aria-expanded="false"
-                                  aria-labelledby="multiselect-label-id-multiselect-:rg:"
+                                  aria-labelledby="urlFormCategoriesLabel"
                                   autocomplete="off"
                                   class="multiSelectFilterField"
                                   id="multiselect-:rg:-input"
+                                  placeholder=""
                                   role="combobox"
                                   type="text"
                                   value=""
@@ -30389,7 +30418,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                               <button
                                 aria-controls="multiselect-option-list-multiselect-:rg:"
                                 aria-expanded="false"
-                                aria-label="toggle menu"
+                                aria-label="stripes-components.multiSelection.dropdownTriggerLabel"
                                 class="multiSelectToggleButton"
                                 id="downshift-:rh:-toggle-button"
                                 tabindex="-1"
@@ -30407,14 +30436,14 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                             <div
                               class="multiSelectMenu"
                               hidden=""
-                              style="width: 100%;"
+                              style="width: 100px;"
                             >
                               <div
                                 class="multiSelectFeedback"
                                 role="alert"
                               />
                               <ul
-                                aria-labelledby="multiselect-label-id-multiselect-:rg:"
+                                aria-labelledby="multiselect-:rg:-label"
                                 class="multiSelectOptionList"
                                 id="multiselect-option-list-multiselect-:rg:"
                                 role="listbox"
diff --git a/src/Organizations/OrganizationForm/OrganizationForm.js b/src/Organizations/OrganizationForm/OrganizationForm.js
index 4327045f..c8f9155a 100644
--- a/src/Organizations/OrganizationForm/OrganizationForm.js
+++ b/src/Organizations/OrganizationForm/OrganizationForm.js
@@ -104,7 +104,7 @@ const OrganizationForm = ({
   const paneFooter = (
     <FormFooter
       id="organization-form-save"
-      label={<FormattedMessage id="ui-organizations.button.saveAndClose" />}
+      label={<FormattedMessage id="stripes-components.saveAndClose" />}
       pristine={pristine}
       submitting={submitting}
       handleSubmit={handleSubmit}
diff --git a/src/Organizations/OrganizationForm/OrganizationSummaryForm/OrganizationSummaryForm.test.js b/src/Organizations/OrganizationForm/OrganizationSummaryForm/OrganizationSummaryForm.test.js
index 15e5b133..87459193 100644
--- a/src/Organizations/OrganizationForm/OrganizationSummaryForm/OrganizationSummaryForm.test.js
+++ b/src/Organizations/OrganizationForm/OrganizationSummaryForm/OrganizationSummaryForm.test.js
@@ -5,6 +5,7 @@ import { MemoryRouter } from 'react-router-dom';
 import stripesFinalForm from '@folio/stripes/final-form';
 
 import { organization, organizationTypes } from 'fixtures';
+import { QueryClient, QueryClientProvider } from 'react-query';
 import OrganizationSummaryForm from './OrganizationSummaryForm';
 
 import { useTypes } from '../../../common/hooks';
@@ -25,11 +26,15 @@ const TestForm = stripesFinalForm({})(
   },
 );
 
+const queryClient = new QueryClient();
+
 const renderForm = ({ initialValues = {} } = {}) => render(
-  <TestForm
-    onSubmit={jest.fn()}
-    initialValues={initialValues}
-  />,
+  <QueryClientProvider client={queryClient}>
+    <TestForm
+      onSubmit={jest.fn()}
+      initialValues={initialValues}
+    />
+  </QueryClientProvider>,
   { wrapper: MemoryRouter },
 );
 
diff --git a/src/Organizations/OrganizationForm/OrganizationSummaryForm/__snapshots__/OrganizationSummaryForm.test.js.snap b/src/Organizations/OrganizationForm/OrganizationSummaryForm/__snapshots__/OrganizationSummaryForm.test.js.snap
index abc8b720..759bae78 100644
--- a/src/Organizations/OrganizationForm/OrganizationSummaryForm/__snapshots__/OrganizationSummaryForm.test.js.snap
+++ b/src/Organizations/OrganizationForm/OrganizationSummaryForm/__snapshots__/OrganizationSummaryForm.test.js.snap
@@ -202,8 +202,8 @@ exports[`OrganizationSummaryForm should render correct structure 1`] = `
           />
           <label
             class="label"
-            for="downshift-:r1:-input"
-            id="multiselect-label-id-organizations-type"
+            for="organizations-type-input"
+            id="organizations-type-label"
           >
             ui-organizations.summary.type
           </label>
@@ -224,7 +224,7 @@ exports[`OrganizationSummaryForm should render correct structure 1`] = `
           >
             <div
               aria-describedby="multi-describe-control-organizations-type"
-              aria-labelledby="multiselect-label-id-organizations-type multi-value-status-organizations-type"
+              aria-labelledby="organizations-type-label multi-value-status-organizations-type"
               class="multiSelectControl formControl"
               role="searchbox"
               tabindex="0"
@@ -293,10 +293,11 @@ exports[`OrganizationSummaryForm should render correct structure 1`] = `
                   aria-autocomplete="list"
                   aria-controls="multiselect-option-list-organizations-type"
                   aria-expanded="false"
-                  aria-labelledby="multiselect-label-id-organizations-type"
+                  aria-labelledby="organizationFormTypesLabel"
                   autocomplete="off"
                   class="multiSelectFilterField"
                   id="organizations-type-input"
+                  placeholder=""
                   role="combobox"
                   type="text"
                   value=""
@@ -312,7 +313,7 @@ exports[`OrganizationSummaryForm should render correct structure 1`] = `
               <button
                 aria-controls="multiselect-option-list-organizations-type"
                 aria-expanded="false"
-                aria-label="toggle menu"
+                aria-label="stripes-components.multiSelection.dropdownTriggerLabel"
                 class="multiSelectToggleButton"
                 id="downshift-:r1:-toggle-button"
                 tabindex="-1"
@@ -330,14 +331,14 @@ exports[`OrganizationSummaryForm should render correct structure 1`] = `
             <div
               class="multiSelectMenu"
               hidden=""
-              style="width: 100%;"
+              style="width: 100px;"
             >
               <div
                 class="multiSelectFeedback"
                 role="alert"
               />
               <ul
-                aria-labelledby="multiselect-label-id-organizations-type"
+                aria-labelledby="organizations-type-label"
                 class="multiSelectOptionList"
                 id="multiselect-option-list-organizations-type"
                 role="listbox"
@@ -383,6 +384,7 @@ exports[`OrganizationSummaryForm should render correct structure 1`] = `
               aria-labelledby="sl-label-selection-:r2: selected-selection-:r2:-item"
               class="selectionControl formControl"
               id="selection-:r2:"
+              name="language"
               type="button"
             >
               <span
@@ -390,6 +392,10 @@ exports[`OrganizationSummaryForm should render correct structure 1`] = `
               >
                 stripes-components.selection.controlLabel
               </span>
+              <div
+                class="singleValue"
+                id="selected-selection-:r2:-item"
+              />
             </button>
             <div
               class="selectionEndControls"
@@ -6787,8 +6793,8 @@ exports[`OrganizationSummaryForm should render correct structure 1`] = `
           />
           <label
             class="label"
-            for="downshift-:r5:-input"
-            id="multiselect-label-id-org-acq-units"
+            for="org-acq-units-input"
+            id="org-acq-units-label"
           >
             stripes-acq-components.label.acqUnits
           </label>
@@ -6809,7 +6815,7 @@ exports[`OrganizationSummaryForm should render correct structure 1`] = `
           >
             <div
               aria-describedby="multi-describe-control-org-acq-units"
-              aria-labelledby="multiselect-label-id-org-acq-units multi-value-status-org-acq-units"
+              aria-labelledby="org-acq-units-label multi-value-status-org-acq-units"
               class="multiSelectControl formControl"
               role="searchbox"
               tabindex="0"
@@ -6822,7 +6828,7 @@ exports[`OrganizationSummaryForm should render correct structure 1`] = `
                   aria-autocomplete="list"
                   aria-controls="multiselect-option-list-org-acq-units"
                   aria-expanded="false"
-                  aria-labelledby="multiselect-label-id-org-acq-units"
+                  aria-labelledby="org-acq-units-label"
                   autocomplete="off"
                   class="multiSelectFilterField"
                   id="org-acq-units-input"
@@ -6841,7 +6847,7 @@ exports[`OrganizationSummaryForm should render correct structure 1`] = `
               <button
                 aria-controls="multiselect-option-list-org-acq-units"
                 aria-expanded="false"
-                aria-label="toggle menu"
+                aria-label="stripes-components.multiSelection.dropdownTriggerLabel"
                 class="multiSelectToggleButton"
                 id="downshift-:r5:-toggle-button"
                 tabindex="-1"
@@ -6859,7 +6865,7 @@ exports[`OrganizationSummaryForm should render correct structure 1`] = `
             <div
               class="multiSelectMenu"
               hidden=""
-              style="width: 100%;"
+              style="width: 100px;"
             >
               <div
                 class="multiSelectFeedback"
@@ -6872,7 +6878,7 @@ exports[`OrganizationSummaryForm should render correct structure 1`] = `
                 </div>
               </div>
               <ul
-                aria-labelledby="multiselect-label-id-org-acq-units"
+                aria-labelledby="org-acq-units-label"
                 class="multiSelectOptionList"
                 id="multiselect-option-list-org-acq-units"
                 role="listbox"
diff --git a/src/Organizations/OrganizationForm/OrganizationVendorInfoForm/__snapshots__/OrganizationVendorInfoForm.test.js.snap b/src/Organizations/OrganizationForm/OrganizationVendorInfoForm/__snapshots__/OrganizationVendorInfoForm.test.js.snap
index 65c560a1..56c14e57 100644
--- a/src/Organizations/OrganizationForm/OrganizationVendorInfoForm/__snapshots__/OrganizationVendorInfoForm.test.js.snap
+++ b/src/Organizations/OrganizationForm/OrganizationVendorInfoForm/__snapshots__/OrganizationVendorInfoForm.test.js.snap
@@ -109,8 +109,8 @@ exports[`OrganizationVendorInfoForm should render correct structure 1`] = `
               />
               <label
                 class="label"
-                for="downshift-:r1:-input"
-                id="multiselect-label-id-multiselect-:r0:"
+                for="multiselect-:r0:-input"
+                id="multiselect-:r0:-label"
               >
                 ui-organizations.vendorInfo.vendorCurrencies
               </label>
@@ -131,7 +131,7 @@ exports[`OrganizationVendorInfoForm should render correct structure 1`] = `
               >
                 <div
                   aria-describedby="multi-describe-control-multiselect-:r0:"
-                  aria-labelledby="multiselect-label-id-multiselect-:r0: multi-value-status-multiselect-:r0:"
+                  aria-labelledby="multiselect-:r0:-label multi-value-status-multiselect-:r0:"
                   class="multiSelectControl formControl"
                   role="searchbox"
                   tabindex="0"
@@ -200,10 +200,11 @@ exports[`OrganizationVendorInfoForm should render correct structure 1`] = `
                       aria-autocomplete="list"
                       aria-controls="multiselect-option-list-multiselect-:r0:"
                       aria-expanded="false"
-                      aria-labelledby="multiselect-label-id-multiselect-:r0:"
+                      aria-labelledby="vendorFormCurrenciesLabel"
                       autocomplete="off"
                       class="multiSelectFilterField"
                       id="multiselect-:r0:-input"
+                      placeholder=""
                       role="combobox"
                       type="text"
                       value=""
@@ -219,7 +220,7 @@ exports[`OrganizationVendorInfoForm should render correct structure 1`] = `
                   <button
                     aria-controls="multiselect-option-list-multiselect-:r0:"
                     aria-expanded="false"
-                    aria-label="toggle menu"
+                    aria-label="stripes-components.multiSelection.dropdownTriggerLabel"
                     class="multiSelectToggleButton"
                     id="downshift-:r1:-toggle-button"
                     tabindex="-1"
@@ -237,14 +238,14 @@ exports[`OrganizationVendorInfoForm should render correct structure 1`] = `
                 <div
                   class="multiSelectMenu"
                   hidden=""
-                  style="width: 100%;"
+                  style="width: 100px;"
                 >
                   <div
                     class="multiSelectFeedback"
                     role="alert"
                   />
                   <ul
-                    aria-labelledby="multiselect-label-id-multiselect-:r0:"
+                    aria-labelledby="multiselect-:r0:-label"
                     class="multiSelectOptionList"
                     id="multiselect-option-list-multiselect-:r0:"
                     role="listbox"
diff --git a/src/Organizations/OrganizationForm/__snapshots__/OrganizationForm.test.js.snap b/src/Organizations/OrganizationForm/__snapshots__/OrganizationForm.test.js.snap
index fe2fa7f0..06718e60 100644
--- a/src/Organizations/OrganizationForm/__snapshots__/OrganizationForm.test.js.snap
+++ b/src/Organizations/OrganizationForm/__snapshots__/OrganizationForm.test.js.snap
@@ -383,7 +383,7 @@ exports[`OrganizationForm should render correct form with metadata 1`] = `
                   <span
                     class="inner"
                   >
-                    ui-organizations.button.saveAndClose
+                    stripes-components.saveAndClose
                   </span>
                 </button>
               </span>
@@ -792,7 +792,7 @@ exports[`OrganizationForm should render correct non-vendor form structure 1`] =
                   <span
                     class="inner"
                   >
-                    ui-organizations.button.saveAndClose
+                    stripes-components.saveAndClose
                   </span>
                 </button>
               </span>
@@ -1375,7 +1375,7 @@ exports[`OrganizationForm should render correct vendor form structure 1`] = `
                   <span
                     class="inner"
                   >
-                    ui-organizations.button.saveAndClose
+                    stripes-components.saveAndClose
                   </span>
                 </button>
               </span>
diff --git a/src/contacts/EditContact/EditContact.js b/src/contacts/EditContact/EditContact.js
index 97956808..acb4a0c0 100644
--- a/src/contacts/EditContact/EditContact.js
+++ b/src/contacts/EditContact/EditContact.js
@@ -85,7 +85,7 @@ const EditContact = ({
           disabled={pristine || submitting}
           onClick={handleSubmit}
         >
-          <FormattedMessage id="ui-organizations.button.saveAndClose" />
+          <FormattedMessage id="stripes-components.saveAndClose" />
         </Button>
       );
 
diff --git a/src/contacts/EditContact/__snapshots__/EditContact.test.js.snap b/src/contacts/EditContact/__snapshots__/EditContact.test.js.snap
index f4a99b7d..9f2ed2aa 100644
--- a/src/contacts/EditContact/__snapshots__/EditContact.test.js.snap
+++ b/src/contacts/EditContact/__snapshots__/EditContact.test.js.snap
@@ -350,6 +350,7 @@ exports[`EditContact should render correct form structure 1`] = `
                               aria-labelledby="sl-label-selection-:r0: selected-selection-:r0:-item"
                               class="selectionControl formControl"
                               id="selection-:r0:"
+                              name="language"
                               type="button"
                             >
                               <span
@@ -357,6 +358,10 @@ exports[`EditContact should render correct form structure 1`] = `
                               >
                                 stripes-components.selection.controlLabel
                               </span>
+                              <div
+                                class="singleValue"
+                                id="selected-selection-:r0:-item"
+                              />
                             </button>
                             <div
                               class="selectionEndControls"
@@ -6754,8 +6759,8 @@ exports[`EditContact should render correct form structure 1`] = `
                           />
                           <label
                             class="label"
-                            for="downshift-:r3:-input"
-                            id="multiselect-label-id-multiselect-:r2:"
+                            for="multiselect-:r2:-input"
+                            id="multiselect-:r2:-label"
                           >
                             ui-organizations.data.contactTypes.categories
                           </label>
@@ -6776,7 +6781,7 @@ exports[`EditContact should render correct form structure 1`] = `
                           >
                             <div
                               aria-describedby="multi-describe-control-multiselect-:r2:"
-                              aria-labelledby="multiselect-label-id-multiselect-:r2: multi-value-status-multiselect-:r2:"
+                              aria-labelledby="multiselect-:r2:-label multi-value-status-multiselect-:r2:"
                               class="multiSelectControl formControl"
                               role="searchbox"
                               tabindex="0"
@@ -6850,10 +6855,11 @@ exports[`EditContact should render correct form structure 1`] = `
                                   aria-autocomplete="list"
                                   aria-controls="multiselect-option-list-multiselect-:r2:"
                                   aria-expanded="false"
-                                  aria-labelledby="multiselect-label-id-multiselect-:r2:"
+                                  aria-labelledby="nameFormCategoriesLabel"
                                   autocomplete="off"
                                   class="multiSelectFilterField"
                                   id="multiselect-:r2:-input"
+                                  placeholder=""
                                   role="combobox"
                                   type="text"
                                   value=""
@@ -6869,7 +6875,7 @@ exports[`EditContact should render correct form structure 1`] = `
                               <button
                                 aria-controls="multiselect-option-list-multiselect-:r2:"
                                 aria-expanded="false"
-                                aria-label="toggle menu"
+                                aria-label="stripes-components.multiSelection.dropdownTriggerLabel"
                                 class="multiSelectToggleButton"
                                 id="downshift-:r3:-toggle-button"
                                 tabindex="-1"
@@ -6887,14 +6893,14 @@ exports[`EditContact should render correct form structure 1`] = `
                             <div
                               class="multiSelectMenu"
                               hidden=""
-                              style="width: 100%;"
+                              style="width: 100px;"
                             >
                               <div
                                 class="multiSelectFeedback"
                                 role="alert"
                               />
                               <ul
-                                aria-labelledby="multiselect-label-id-multiselect-:r2:"
+                                aria-labelledby="multiselect-:r2:-label"
                                 class="multiSelectOptionList"
                                 id="multiselect-option-list-multiselect-:r2:"
                                 role="listbox"
@@ -7187,6 +7193,7 @@ exports[`EditContact should render correct form structure 1`] = `
                                           aria-labelledby="sl-label-selection-:r4: selected-selection-:r4:-item"
                                           class="selectionControl formControl"
                                           id="selection-:r4:"
+                                          name="emails[0].language"
                                           type="button"
                                         >
                                           <span
@@ -7194,6 +7201,10 @@ exports[`EditContact should render correct form structure 1`] = `
                                           >
                                             stripes-components.selection.controlLabel
                                           </span>
+                                          <div
+                                            class="singleValue"
+                                            id="selected-selection-:r4:-item"
+                                          />
                                         </button>
                                         <div
                                           class="selectionEndControls"
@@ -13607,7 +13618,7 @@ exports[`EditContact should render correct form structure 1`] = `
                                       >
                                         <div
                                           aria-describedby="multi-describe-control-multiselect-:r6:"
-                                          aria-labelledby="multi-value-status-multiselect-:r6:"
+                                          aria-labelledby="emailFormCategoriesLabel multi-value-status-multiselect-:r6:"
                                           class="multiSelectControl formControl"
                                           role="searchbox"
                                           tabindex="0"
@@ -13681,10 +13692,11 @@ exports[`EditContact should render correct form structure 1`] = `
                                               aria-autocomplete="list"
                                               aria-controls="multiselect-option-list-multiselect-:r6:"
                                               aria-expanded="false"
-                                              aria-labelledby="multiselect-label-id-multiselect-:r6:"
+                                              aria-labelledby="emailFormCategoriesLabel"
                                               autocomplete="off"
                                               class="multiSelectFilterField"
                                               id="multiselect-:r6:-input"
+                                              placeholder=""
                                               role="combobox"
                                               type="text"
                                               value=""
@@ -13700,7 +13712,7 @@ exports[`EditContact should render correct form structure 1`] = `
                                           <button
                                             aria-controls="multiselect-option-list-multiselect-:r6:"
                                             aria-expanded="false"
-                                            aria-label="toggle menu"
+                                            aria-label="stripes-components.multiSelection.dropdownTriggerLabel"
                                             class="multiSelectToggleButton"
                                             id="downshift-:r7:-toggle-button"
                                             tabindex="-1"
@@ -13718,14 +13730,14 @@ exports[`EditContact should render correct form structure 1`] = `
                                         <div
                                           class="multiSelectMenu"
                                           hidden=""
-                                          style="width: 100%;"
+                                          style="width: 100px;"
                                         >
                                           <div
                                             class="multiSelectFeedback"
                                             role="alert"
                                           />
                                           <ul
-                                            aria-labelledby="multiselect-label-id-multiselect-:r6:"
+                                            aria-labelledby="multiselect-:r6:-label"
                                             class="multiSelectOptionList"
                                             id="multiselect-option-list-multiselect-:r6:"
                                             role="listbox"
@@ -14065,6 +14077,7 @@ exports[`EditContact should render correct form structure 1`] = `
                                           aria-labelledby="sl-label-selection-:r8: selected-selection-:r8:-item"
                                           class="selectionControl formControl"
                                           id="selection-:r8:"
+                                          name="phoneNumbers[0].language"
                                           type="button"
                                         >
                                           <span
@@ -14072,6 +14085,10 @@ exports[`EditContact should render correct form structure 1`] = `
                                           >
                                             stripes-components.selection.controlLabel
                                           </span>
+                                          <div
+                                            class="singleValue"
+                                            id="selected-selection-:r8:-item"
+                                          />
                                         </button>
                                         <div
                                           class="selectionEndControls"
@@ -20485,7 +20502,7 @@ exports[`EditContact should render correct form structure 1`] = `
                                       >
                                         <div
                                           aria-describedby="multi-describe-control-multiselect-:ra:"
-                                          aria-labelledby="multi-value-status-multiselect-:ra:"
+                                          aria-labelledby="phoneFormCategoriesLabel multi-value-status-multiselect-:ra:"
                                           class="multiSelectControl formControl"
                                           role="searchbox"
                                           tabindex="0"
@@ -20559,10 +20576,11 @@ exports[`EditContact should render correct form structure 1`] = `
                                               aria-autocomplete="list"
                                               aria-controls="multiselect-option-list-multiselect-:ra:"
                                               aria-expanded="false"
-                                              aria-labelledby="multiselect-label-id-multiselect-:ra:"
+                                              aria-labelledby="phoneFormCategoriesLabel"
                                               autocomplete="off"
                                               class="multiSelectFilterField"
                                               id="multiselect-:ra:-input"
+                                              placeholder=""
                                               role="combobox"
                                               type="text"
                                               value=""
@@ -20578,7 +20596,7 @@ exports[`EditContact should render correct form structure 1`] = `
                                           <button
                                             aria-controls="multiselect-option-list-multiselect-:ra:"
                                             aria-expanded="false"
-                                            aria-label="toggle menu"
+                                            aria-label="stripes-components.multiSelection.dropdownTriggerLabel"
                                             class="multiSelectToggleButton"
                                             id="downshift-:rb:-toggle-button"
                                             tabindex="-1"
@@ -20596,14 +20614,14 @@ exports[`EditContact should render correct form structure 1`] = `
                                         <div
                                           class="multiSelectMenu"
                                           hidden=""
-                                          style="width: 100%;"
+                                          style="width: 100px;"
                                         >
                                           <div
                                             class="multiSelectFeedback"
                                             role="alert"
                                           />
                                           <ul
-                                            aria-labelledby="multiselect-label-id-multiselect-:ra:"
+                                            aria-labelledby="multiselect-:ra:-label"
                                             class="multiSelectOptionList"
                                             id="multiselect-option-list-multiselect-:ra:"
                                             role="listbox"
@@ -20920,6 +20938,7 @@ exports[`EditContact should render correct form structure 1`] = `
                                           aria-labelledby="sl-label-selection-:rc: selected-selection-:rc:-item"
                                           class="selectionControl formControl"
                                           id="selection-:rc:"
+                                          name="urls[0].language"
                                           type="button"
                                         >
                                           <span
@@ -20927,6 +20946,10 @@ exports[`EditContact should render correct form structure 1`] = `
                                           >
                                             stripes-components.selection.controlLabel
                                           </span>
+                                          <div
+                                            class="singleValue"
+                                            id="selected-selection-:rc:-item"
+                                          />
                                         </button>
                                         <div
                                           class="selectionEndControls"
@@ -27340,7 +27363,7 @@ exports[`EditContact should render correct form structure 1`] = `
                                       >
                                         <div
                                           aria-describedby="multi-describe-control-multiselect-:re:"
-                                          aria-labelledby="multi-value-status-multiselect-:re:"
+                                          aria-labelledby="urlFormCategoriesLabel multi-value-status-multiselect-:re:"
                                           class="multiSelectControl formControl"
                                           role="searchbox"
                                           tabindex="0"
@@ -27414,10 +27437,11 @@ exports[`EditContact should render correct form structure 1`] = `
                                               aria-autocomplete="list"
                                               aria-controls="multiselect-option-list-multiselect-:re:"
                                               aria-expanded="false"
-                                              aria-labelledby="multiselect-label-id-multiselect-:re:"
+                                              aria-labelledby="urlFormCategoriesLabel"
                                               autocomplete="off"
                                               class="multiSelectFilterField"
                                               id="multiselect-:re:-input"
+                                              placeholder=""
                                               role="combobox"
                                               type="text"
                                               value=""
@@ -27433,7 +27457,7 @@ exports[`EditContact should render correct form structure 1`] = `
                                           <button
                                             aria-controls="multiselect-option-list-multiselect-:re:"
                                             aria-expanded="false"
-                                            aria-label="toggle menu"
+                                            aria-label="stripes-components.multiSelection.dropdownTriggerLabel"
                                             class="multiSelectToggleButton"
                                             id="downshift-:rf:-toggle-button"
                                             tabindex="-1"
@@ -27451,14 +27475,14 @@ exports[`EditContact should render correct form structure 1`] = `
                                         <div
                                           class="multiSelectMenu"
                                           hidden=""
-                                          style="width: 100%;"
+                                          style="width: 100px;"
                                         >
                                           <div
                                             class="multiSelectFeedback"
                                             role="alert"
                                           />
                                           <ul
-                                            aria-labelledby="multiselect-label-id-multiselect-:re:"
+                                            aria-labelledby="multiselect-:re:-label"
                                             class="multiSelectOptionList"
                                             id="multiselect-option-list-multiselect-:re:"
                                             role="listbox"
@@ -27872,14 +27896,21 @@ exports[`EditContact should render correct form structure 1`] = `
                                               aria-labelledby="sl-label-selection-:rg: selected-selection-:rg:-item"
                                               class="selectionControl formControl"
                                               id="selection-:rg:"
+                                              name="addresses[0].country"
                                               type="button"
+                                              value="USA"
                                             >
                                               <span
                                                 class="sr-only"
                                               >
                                                 stripes-components.selection.controlLabel
                                               </span>
-                                              US
+                                              <div
+                                                class="singleValue"
+                                                id="selected-selection-:rg:-item"
+                                              >
+                                                US
+                                              </div>
                                             </button>
                                             <div
                                               class="selectionEndControls"
@@ -31175,6 +31206,7 @@ exports[`EditContact should render correct form structure 1`] = `
                                               aria-labelledby="sl-label-selection-:ri: selected-selection-:ri:-item"
                                               class="selectionControl formControl"
                                               id="selection-:ri:"
+                                              name="addresses[0].language"
                                               type="button"
                                             >
                                               <span
@@ -31182,6 +31214,10 @@ exports[`EditContact should render correct form structure 1`] = `
                                               >
                                                 stripes-components.selection.controlLabel
                                               </span>
+                                              <div
+                                                class="singleValue"
+                                                id="selected-selection-:ri:-item"
+                                              />
                                             </button>
                                             <div
                                               class="selectionEndControls"
@@ -37580,8 +37616,8 @@ exports[`EditContact should render correct form structure 1`] = `
                                           />
                                           <label
                                             class="label"
-                                            for="downshift-:rl:-input"
-                                            id="multiselect-label-id-multiselect-:rk:"
+                                            for="multiselect-:rk:-input"
+                                            id="multiselect-:rk:-label"
                                           >
                                             ui-organizations.data.contactTypes.categories
                                           </label>
@@ -37602,7 +37638,7 @@ exports[`EditContact should render correct form structure 1`] = `
                                           >
                                             <div
                                               aria-describedby="multi-describe-control-multiselect-:rk:"
-                                              aria-labelledby="multiselect-label-id-multiselect-:rk: multi-value-status-multiselect-:rk:"
+                                              aria-labelledby="multiselect-:rk:-label multi-value-status-multiselect-:rk:"
                                               class="multiSelectControl formControl"
                                               role="searchbox"
                                               tabindex="0"
@@ -37676,10 +37712,11 @@ exports[`EditContact should render correct form structure 1`] = `
                                                   aria-autocomplete="list"
                                                   aria-controls="multiselect-option-list-multiselect-:rk:"
                                                   aria-expanded="false"
-                                                  aria-labelledby="multiselect-label-id-multiselect-:rk:"
+                                                  aria-labelledby="addressFormCategoriesLabel"
                                                   autocomplete="off"
                                                   class="multiSelectFilterField"
                                                   id="multiselect-:rk:-input"
+                                                  placeholder=""
                                                   role="combobox"
                                                   type="text"
                                                   value=""
@@ -37695,7 +37732,7 @@ exports[`EditContact should render correct form structure 1`] = `
                                               <button
                                                 aria-controls="multiselect-option-list-multiselect-:rk:"
                                                 aria-expanded="false"
-                                                aria-label="toggle menu"
+                                                aria-label="stripes-components.multiSelection.dropdownTriggerLabel"
                                                 class="multiSelectToggleButton"
                                                 id="downshift-:rl:-toggle-button"
                                                 tabindex="-1"
@@ -37713,14 +37750,14 @@ exports[`EditContact should render correct form structure 1`] = `
                                             <div
                                               class="multiSelectMenu"
                                               hidden=""
-                                              style="width: 100%;"
+                                              style="width: 100px;"
                                             >
                                               <div
                                                 class="multiSelectFeedback"
                                                 role="alert"
                                               />
                                               <ul
-                                                aria-labelledby="multiselect-label-id-multiselect-:rk:"
+                                                aria-labelledby="multiselect-:rk:-label"
                                                 class="multiSelectOptionList"
                                                 id="multiselect-option-list-multiselect-:rk:"
                                                 role="listbox"
@@ -37833,7 +37870,7 @@ exports[`EditContact should render correct form structure 1`] = `
               <span
                 class="inner"
               >
-                ui-organizations.button.saveAndClose
+                stripes-components.saveAndClose
               </span>
             </button>
           </span>
diff --git a/translations/ui-organizations/en.json b/translations/ui-organizations/en.json
index 7a8bc1cc..2051e82c 100644
--- a/translations/ui-organizations/en.json
+++ b/translations/ui-organizations/en.json
@@ -138,7 +138,6 @@
 
   "button.bankingInformation.add": "Add banking information",
   "button.cancel": "Cancel",
-  "button.saveAndClose": "Save & close",
 
   "contacts.actions.load.error": "Failed to load contacts data",