diff --git a/package-lock.json b/package-lock.json
index 36bcae8483..51263937aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
             "dependencies": {
                 "@emotion/react": "^11.14.0",
                 "@emotion/styled": "^11.14.1",
-                "@gridsuite/commons-ui": "0.136.0",
+                "@gridsuite/commons-ui": "0.137.0",
                 "@hello-pangea/dnd": "^18.0.1",
                 "@hookform/resolvers": "^4.1.3",
                 "@mui/icons-material": "^5.18.0",
@@ -3404,9 +3404,9 @@
             }
         },
         "node_modules/@gridsuite/commons-ui": {
-            "version": "0.136.0",
-            "resolved": "https://registry.npmjs.org/@gridsuite/commons-ui/-/commons-ui-0.136.0.tgz",
-            "integrity": "sha512-2/MeU1/FDRiR8DZC8CFqYQmkwZ/zAuAMomCwNWRlobG3hQPOh/xSaKqGPG6G+VZ12//YJAYYWUavXtsRAQTkHg==",
+            "version": "0.137.0",
+            "resolved": "https://registry.npmjs.org/@gridsuite/commons-ui/-/commons-ui-0.137.0.tgz",
+            "integrity": "sha512-1VJqWSzlo4rn556j5Q5k508J5+W3ExiOSqQlZhc/tbVa+MIMu3BNyDm8FI6ZoTW4YvdzlGejCX5cxsV6Bv/gDg==",
             "license": "MPL-2.0",
             "dependencies": {
                 "@ag-grid-community/locale": "^33.3.2",
diff --git a/package.json b/package.json
index 7e74d00252..bb83b0f31e 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "dependencies": {
         "@emotion/react": "^11.14.0",
         "@emotion/styled": "^11.14.1",
-        "@gridsuite/commons-ui": "0.136.0",
+        "@gridsuite/commons-ui": "0.137.0",
         "@hello-pangea/dnd": "^18.0.1",
         "@hookform/resolvers": "^4.1.3",
         "@mui/icons-material": "^5.18.0",
diff --git a/src/components/app-wrapper.jsx b/src/components/app-wrapper.jsx
index aaa8ce6eaf..ede88ecbcc 100644
--- a/src/components/app-wrapper.jsx
+++ b/src/components/app-wrapper.jsx
@@ -35,6 +35,8 @@ import {
     filterExpertFr,
     equipmentSearchEn,
     equipmentSearchFr,
+    equipmentShortEn,
+    equipmentShortFr,
     directoryItemsInputEn,
     directoryItemsInputFr,
     treeviewFinderEn,
@@ -382,6 +384,7 @@ const messages = {
         ...elementSearchEn,
         ...filterExpertEn,
         ...equipmentSearchEn,
+        ...equipmentShortEn,
         ...directoryItemsInputEn,
         ...cardErrorBoundaryEn,
         ...flatParametersEn,
@@ -418,6 +421,7 @@ const messages = {
         ...elementSearchFr,
         ...filterExpertFr,
         ...equipmentSearchFr,
+        ...equipmentShortFr,
         ...directoryItemsInputFr,
         ...cardErrorBoundaryFr,
         ...flatParametersFr,
diff --git a/src/components/results/common/global-filter/global-filter-autocomplete.tsx b/src/components/results/common/global-filter/global-filter-autocomplete.tsx
index 1987441f62..160b4e4716 100644
--- a/src/components/results/common/global-filter/global-filter-autocomplete.tsx
+++ b/src/components/results/common/global-filter/global-filter-autocomplete.tsx
@@ -27,7 +27,7 @@ import { useLocalizedCountries } from 'components/utils/localized-countries-hook
 import { useSelector } from 'react-redux';
 import { AppState } from '../../../../redux/reducer';
 import { FilterType } from '../utils';
-import { OverflowableText } from '@gridsuite/commons-ui';
+import { OverflowableText, OverflowableChip } from '@gridsuite/commons-ui';
 import { EQUIPMENT_TYPES } from '../../../utils/equipment-types';
 import { GlobalFilter } from './global-filter-types';
 import { getResultsGlobalFiltersChipStyle, resultsGlobalFilterStyles } from './global-filter-styles';
@@ -223,8 +223,7 @@ function GlobalFilterAutocomplete({
             const key: string = `inputFieldChip_${element.label}`;
             if (index < TAG_LIMIT_NUMBER) {
                 return (
-                    <Chip
-                        size="small"
+                    <OverflowableChip
                         label={label}
                         {...getTagsProps({ index })}
                         key={key}
diff --git a/src/components/results/common/global-filter/global-filter-paper.tsx b/src/components/results/common/global-filter/global-filter-paper.tsx
index 3caa44fcb5..0216b7862b 100644
--- a/src/components/results/common/global-filter/global-filter-paper.tsx
+++ b/src/components/results/common/global-filter/global-filter-paper.tsx
@@ -29,6 +29,7 @@ import {
     fetchElementsInfos,
     mergeSx,
     TreeViewFinderNodeProps,
+    OverflowableChip,
 } from '@gridsuite/commons-ui';
 import { GlobalFilterContext } from './global-filter-context';
 
@@ -213,8 +214,7 @@ function GlobalFilterPaper({ children, autocompleteRef }: Readonly<GlobalFilterP
                             <List sx={mergeSx(resultsGlobalFilterStyles.list, { overflowY: 'auto' })}>
                                 {selectedGlobalFilters.map((element: GlobalFilter) => (
                                     <ListItem key={element.label} sx={{ height: '1.8em' }}>
-                                        <Chip
-                                            size="small"
+                                        <OverflowableChip
                                             label={getOptionLabel(element, translate)}
                                             sx={getResultsGlobalFiltersChipStyle(element.filterType)}
                                             onDelete={() => {