diff --git a/src/fireedge/src/client/components/Cards/MarketplaceAppCard.js b/src/fireedge/src/client/components/Cards/MarketplaceAppCard.js
index a357450430..4d95cd24e6 100644
--- a/src/fireedge/src/client/components/Cards/MarketplaceAppCard.js
+++ b/src/fireedge/src/client/components/Cards/MarketplaceAppCard.js
@@ -80,6 +80,7 @@ const MarketplaceAppCard = memo(
       () =>
         getUniqueLabels(LABELS).map((label) => ({
           text: label,
+          dataCy: `label-${label}`,
           stateColor: getColorFromString(label),
           onClick: onClickLabel,
           onDelete: enableEditLabels && onDeleteLabel,
diff --git a/src/fireedge/src/client/components/Tables/Enhanced/index.js b/src/fireedge/src/client/components/Tables/Enhanced/index.js
index 4c3867d652..f589286655 100644
--- a/src/fireedge/src/client/components/Tables/Enhanced/index.js
+++ b/src/fireedge/src/client/components/Tables/Enhanced/index.js
@@ -111,6 +111,7 @@ const EnhancedTable = ({
       autoResetSelectedRows: false,
       autoResetSortBy: false,
       autoResetPage: false,
+      autoResetGlobalFilter: false,
       // -------------------------------------
       initialState: { pageSize, ...initialState },
     },
@@ -125,7 +126,7 @@ const EnhancedTable = ({
     getTableProps,
     prepareRow,
     toggleAllRowsSelected,
-    preFilteredRows,
+    preGlobalFilteredRowsById,
     rows,
     page,
     gotoPage,
@@ -148,10 +149,11 @@ const EnhancedTable = ({
       ?.scrollIntoView({ behavior: 'smooth', block: 'center' })
   }
 
-  const selectedRows = useMemo(
-    () => preFilteredRows.filter((row) => !!state.selectedRowIds[row.id]),
-    [data, state.selectedRowIds]
-  )
+  const selectedRows = useMemo(() => {
+    const selectedIds = Object.keys(state.selectedRowIds ?? {})
+
+    return selectedIds.map((id) => preGlobalFilteredRowsById[id])
+  }, [state.selectedRowIds])
 
   useMountedLayoutEffect(() => {
     onSelectedRowsChange?.(
diff --git a/src/fireedge/src/client/containers/Settings/LabelsSection/index.js b/src/fireedge/src/client/containers/Settings/LabelsSection/index.js
index 20a7a2116a..279daab505 100644
--- a/src/fireedge/src/client/containers/Settings/LabelsSection/index.js
+++ b/src/fireedge/src/client/containers/Settings/LabelsSection/index.js
@@ -121,9 +121,15 @@ const Settings = () => {
         </Typography>
       </Box>
       <Stack height={1} gap="0.5rem" p="0.5rem" overflow="auto">
+        {labels.length === 0 && (
+          <Typography variant="subtitle2">
+            <Translate word={T.NoLabels} />
+          </Typography>
+        )}
         {result?.map((label) => (
           <LabelWrapper
             key={label}
+            data-cy={`wrapper-${label}`}
             // highlight the label when it is added
             ownerState={{ highlight: data === label }}
           >