diff --git a/apps/web/messages/af.json b/apps/web/messages/af.json
index 4c0a859a..1e68baf4 100644
--- a/apps/web/messages/af.json
+++ b/apps/web/messages/af.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env na knipbord gekopieer",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/ar.json b/apps/web/messages/ar.json
index ef789f4c..ece4cdb7 100644
--- a/apps/web/messages/ar.json
+++ b/apps/web/messages/ar.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": "تم نسخ .env إلى الحافظة",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/ca.json b/apps/web/messages/ca.json
index b6d3040b..48f3abcd 100644
--- a/apps/web/messages/ca.json
+++ b/apps/web/messages/ca.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env copiat al porta-retalls",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/cs.json b/apps/web/messages/cs.json
index 2733dca8..039f0df0 100644
--- a/apps/web/messages/cs.json
+++ b/apps/web/messages/cs.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env zkopírováno do schránky",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/da.json b/apps/web/messages/da.json
index a424ae1d..7e0ccaf6 100644
--- a/apps/web/messages/da.json
+++ b/apps/web/messages/da.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env kopieret til udklipsholder",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/de.json b/apps/web/messages/de.json
index 0f694cc5..7b1f395b 100644
--- a/apps/web/messages/de.json
+++ b/apps/web/messages/de.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env in die Zwischenablage kopiert",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/el.json b/apps/web/messages/el.json
index 21b63921..4e2184ec 100644
--- a/apps/web/messages/el.json
+++ b/apps/web/messages/el.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": "Το .env αντιγράφηκε στο πρόχειρο",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/en.json b/apps/web/messages/en.json
index fd8206b6..695f7d99 100644
--- a/apps/web/messages/en.json
+++ b/apps/web/messages/en.json
@@ -918,7 +918,14 @@
       "cancel": "Cancel",
       "confirmDelete": "Delete",
       "deleteDialogTitle": "Delete environment set?",
-      "deleteDialogDescription": "This removes the encrypted blob from your account. You cannot undo this."
+      "deleteDialogDescription": "This removes the encrypted blob from your account. You cannot undo this.",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env copied to clipboard",
@@ -964,7 +971,9 @@
       "toastUpdateFailed": "Failed to update",
       "toastPasteEmpty": "No KEY=value lines found",
       "toastPasteApplied": "Merged {count} variables from paste",
-      "toastProjectEnvRequired": "Project and environment are required"
+      "toastProjectEnvRequired": "Project and environment are required",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/es.json b/apps/web/messages/es.json
index eba69f2a..711df720 100644
--- a/apps/web/messages/es.json
+++ b/apps/web/messages/es.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env copiado al portapapeles",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/fa.json b/apps/web/messages/fa.json
index 73858be4..3e551e86 100644
--- a/apps/web/messages/fa.json
+++ b/apps/web/messages/fa.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env در کلیپ‌بورد کپی شد",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/fr.json b/apps/web/messages/fr.json
index 3e6790df..3bb2e54f 100644
--- a/apps/web/messages/fr.json
+++ b/apps/web/messages/fr.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env copié dans le presse-papiers",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/id.json b/apps/web/messages/id.json
index feb1e71a..0f772778 100644
--- a/apps/web/messages/id.json
+++ b/apps/web/messages/id.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env disalin ke papan klip",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/it.json b/apps/web/messages/it.json
index db76825b..c9f8be30 100644
--- a/apps/web/messages/it.json
+++ b/apps/web/messages/it.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env copiato negli appunti",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/ja.json b/apps/web/messages/ja.json
index 1a3f43d7..4599f6e2 100644
--- a/apps/web/messages/ja.json
+++ b/apps/web/messages/ja.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env をクリップボードにコピーしました",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/ko.json b/apps/web/messages/ko.json
index 60fb1038..ab79f390 100644
--- a/apps/web/messages/ko.json
+++ b/apps/web/messages/ko.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env가 클립보드에 복사됨",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/ms.json b/apps/web/messages/ms.json
index fdffaa50..7c8ce8fc 100644
--- a/apps/web/messages/ms.json
+++ b/apps/web/messages/ms.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env disalin ke papan keratan",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/nb.json b/apps/web/messages/nb.json
index e2be4c9c..0b9bc1c6 100644
--- a/apps/web/messages/nb.json
+++ b/apps/web/messages/nb.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env kopiert til utklippstavle",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/nl.json b/apps/web/messages/nl.json
index 519e648e..9a79864b 100644
--- a/apps/web/messages/nl.json
+++ b/apps/web/messages/nl.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env naar klembord gekopieerd",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/pl.json b/apps/web/messages/pl.json
index 92904895..fa489bd7 100644
--- a/apps/web/messages/pl.json
+++ b/apps/web/messages/pl.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env skopiowano do schowka",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/pt-BR.json b/apps/web/messages/pt-BR.json
index 57901ee6..0ceb6043 100644
--- a/apps/web/messages/pt-BR.json
+++ b/apps/web/messages/pt-BR.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env copiado para a área de transferência",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/pt.json b/apps/web/messages/pt.json
index 4b483dfd..653b6b10 100644
--- a/apps/web/messages/pt.json
+++ b/apps/web/messages/pt.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env copiado para a área de transferência",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/ru.json b/apps/web/messages/ru.json
index 972e8bf0..b7200449 100644
--- a/apps/web/messages/ru.json
+++ b/apps/web/messages/ru.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env скопирован в буфер обмена",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/sv.json b/apps/web/messages/sv.json
index 18d63658..a0829ee6 100644
--- a/apps/web/messages/sv.json
+++ b/apps/web/messages/sv.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env kopierat till urklipp",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/tr.json b/apps/web/messages/tr.json
index 3cc29c1a..2996d120 100644
--- a/apps/web/messages/tr.json
+++ b/apps/web/messages/tr.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env panoya kopyalandı",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/uk.json b/apps/web/messages/uk.json
index 7605a583..e0d1dbbd 100644
--- a/apps/web/messages/uk.json
+++ b/apps/web/messages/uk.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": ".env скопійовано в буфер обміну",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/vi.json b/apps/web/messages/vi.json
index 3712be44..fa658c3f 100644
--- a/apps/web/messages/vi.json
+++ b/apps/web/messages/vi.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": "Đã sao chép .env vào clipboard",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/messages/zh.json b/apps/web/messages/zh.json
index 941835ed..47cbc74c 100644
--- a/apps/web/messages/zh.json
+++ b/apps/web/messages/zh.json
@@ -916,7 +916,14 @@
       "viewDialogSubtitle": "Decrypted variables in .env format. Do not share your screen in untrusted environments.",
       "viewNoVariables": "No variables in this set.",
       "viewNotesHeading": "Notes",
-      "closeView": "Close"
+      "closeView": "Close",
+      "noResultsTitle": "No results",
+      "noResultsHint": "No sets match your search or filter. Try adjusting your query.",
+      "sort": {
+        "updatedDesc": "Newest first",
+        "updatedAsc": "Oldest first",
+        "nameAsc": "Name A→Z"
+      }
     },
     "toasts": {
       "copiedDotEnv": "已复制 .env 到剪贴板",
@@ -962,7 +969,9 @@
       "addCommentedVariables": "Add commented variables",
       "toastPasteAutoMerged": "{count, plural, one {Merged # variable from paste} other {Merged # variables from paste}}",
       "toastPasteCommentedOnly": "Only commented-out variables found — add them with the button below if you need them.",
-      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}"
+      "toastCommentedAdded": "{count, plural, one {Added # commented variable} other {Added # commented variables}}",
+      "showValues": "Show values",
+      "hideValues": "Hide values"
     }
   },
   "Bookmarks": {
diff --git a/apps/web/src/app/app/environment-manager/page.tsx b/apps/web/src/app/app/environment-manager/page.tsx
index b3ee9b11..b1a9842b 100644
--- a/apps/web/src/app/app/environment-manager/page.tsx
+++ b/apps/web/src/app/app/environment-manager/page.tsx
@@ -28,19 +28,22 @@ export default function EnvironmentManagerPage() {
     useEffect(() => {
         if (!encryptionKey || loadedRef.current) return
         loadedRef.current = true
-        loadSets(encryptionKey)
+        let cancelled = false
+        loadSets(encryptionKey, () => cancelled)
 
         return () => {
+            cancelled = true
             clearSets()
             loadedRef.current = false
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [encryptionKey])
 
-    const loadSets = async (key: CryptoKey) => {
+    const loadSets = async (key: CryptoKey, isCancelled: () => boolean) => {
         setLoading(true)
         try {
             const rows = await listEnvSetEntries()
+            if (isCancelled()) return
             const decrypted = await Promise.all(
                 rows.map(async (row) => {
                     try {
@@ -58,11 +61,12 @@ export default function EnvironmentManagerPage() {
                     }
                 })
             )
+            if (isCancelled()) return
             setSets(decrypted.filter((x): x is EnvSetEntry => x !== null))
         } catch {
-            toast.error(t("loadFailed"))
+            if (!isCancelled()) toast.error(t("loadFailed"))
         } finally {
-            setLoading(false)
+            if (!isCancelled()) setLoading(false)
         }
     }
 
diff --git a/apps/web/src/components/environment-manager/add-environment-set-dialog.tsx b/apps/web/src/components/environment-manager/add-environment-set-dialog.tsx
index d5945173..48b05420 100644
--- a/apps/web/src/components/environment-manager/add-environment-set-dialog.tsx
+++ b/apps/web/src/components/environment-manager/add-environment-set-dialog.tsx
@@ -8,7 +8,7 @@ import { useIsMobile } from "@/components/hooks/use-mobile"
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
 import { Textarea } from "@/components/ui/textarea"
-import { Plus, Trash2 } from "lucide-react"
+import { Plus, Trash2, Eye, EyeOff } from "lucide-react"
 import {
     useEnvironmentManagerStore,
     type EnvVariableRow,
@@ -23,8 +23,10 @@ import { cn } from "@/lib/utils"
 import { toast } from "sonner"
 import { useTranslations } from "next-intl"
 
-function emptyVariable(): EnvVariableRow {
-    return { key: "", value: "" }
+type VarRow = EnvVariableRow & { _uid: string }
+
+function emptyVariable(): VarRow {
+    return { key: "", value: "", _uid: crypto.randomUUID() }
 }
 
 export function AddEnvironmentSetDialog({ children }: { children?: React.ReactNode }) {
@@ -33,9 +35,10 @@ export function AddEnvironmentSetDialog({ children }: { children?: React.ReactNo
     const { addSet } = useEnvironmentManagerStore()
     const [open, setOpen] = useState(false)
     const [loading, setLoading] = useState(false)
+    const [showValues, setShowValues] = useState(false)
     const [project, setProject] = useState("")
     const [environment, setEnvironment] = useState("")
-    const [variables, setVariables] = useState<EnvVariableRow[]>([emptyVariable()])
+    const [variables, setVariables] = useState<VarRow[]>([emptyVariable()])
     const [tags, setTags] = useState<string[]>([])
     const [tagInput, setTagInput] = useState("")
     const [notes, setNotes] = useState("")
@@ -55,6 +58,7 @@ export function AddEnvironmentSetDialog({ children }: { children?: React.ReactNo
         setPasteOpen(false)
         setPendingCommented([])
         setPlainCommentLines(0)
+        setShowValues(false)
     }
 
     const handleAddTag = (e: React.KeyboardEvent) => {
@@ -82,7 +86,9 @@ export function AddEnvironmentSetDialog({ children }: { children?: React.ReactNo
             return
         }
 
-        const cleanedVars = variables.filter((r) => r.key.trim())
+        const cleanedVars = variables
+            .filter((r) => r.key.trim())
+            .map(({ key, value }) => ({ key, value }))
         const payload = { project: proj, environment: env, variables: cleanedVars, tags, notes }
 
         setLoading(true)
@@ -150,28 +156,55 @@ export function AddEnvironmentSetDialog({ children }: { children?: React.ReactNo
                 plainCommentLines={plainCommentLines}
                 onPendingCommentedChange={setPendingCommented}
                 onPlainCommentLinesChange={setPlainCommentLines}
-                setVariables={setVariables}
-                emptyRow={emptyVariable()}
+                onMergeVariables={(incoming) =>
+                    setVariables((prev) => {
+                        const base = prev.filter((r) => r.key.trim() || r.value.trim())
+                        const keyIndex = new Map(base.map((r, i) => [r.key, i]))
+                        const result = [...base]
+                        for (const row of incoming) {
+                            const idx = keyIndex.get(row.key)
+                            if (idx !== undefined) {
+                                result[idx] = { ...row, _uid: result[idx]._uid }
+                            } else {
+                                keyIndex.set(row.key, result.length)
+                                result.push({ ...row, _uid: crypto.randomUUID() })
+                            }
+                        }
+                        return result.length > 0 ? result : [emptyVariable()]
+                    })
+                }
                 t={t as (key: string, values?: Record<string, string | number | boolean | Date>) => string}
             />
 
             <div className="space-y-2">
                 <div className="flex items-center justify-between">
                     <Label>{t("variables")}</Label>
-                    <Button
-                        type="button"
-                        variant="ghost"
-                        size="sm"
-                        className="h-8"
-                        onClick={() => setVariables((v) => [...v, emptyVariable()])}
-                    >
-                        <Plus className="h-4 w-4 mr-1" />
-                        {t("addRow")}
-                    </Button>
+                    <div className="flex items-center gap-1">
+                        <Button
+                            type="button"
+                            variant="ghost"
+                            size="sm"
+                            className="h-8 gap-1"
+                            onClick={() => setShowValues((v) => !v)}
+                        >
+                            {showValues ? <EyeOff className="h-3.5 w-3.5" /> : <Eye className="h-3.5 w-3.5" />}
+                            {showValues ? t("hideValues") : t("showValues")}
+                        </Button>
+                        <Button
+                            type="button"
+                            variant="ghost"
+                            size="sm"
+                            className="h-8"
+                            onClick={() => setVariables((v) => [...v, emptyVariable()])}
+                        >
+                            <Plus className="h-4 w-4 mr-1" />
+                            {t("addRow")}
+                        </Button>
+                    </div>
                 </div>
                 <div className="space-y-2 max-h-[240px] overflow-y-auto pr-1">
                     {variables.map((row, i) => (
-                        <div key={i} className="flex gap-2 items-start">
+                        <div key={row._uid} className="flex gap-2 items-start">
                             <Input
                                 placeholder={t("keyPlaceholder")}
                                 value={row.key}
@@ -185,7 +218,7 @@ export function AddEnvironmentSetDialog({ children }: { children?: React.ReactNo
                             <Input
                                 placeholder={t("valuePlaceholder")}
                                 value={row.value}
-                                type="password"
+                                type={showValues ? "text" : "password"}
                                 className="font-mono text-sm flex-1 min-w-0"
                                 onChange={(e) => {
                                     const next = [...variables]
diff --git a/apps/web/src/components/environment-manager/edit-environment-set-dialog.tsx b/apps/web/src/components/environment-manager/edit-environment-set-dialog.tsx
index ddb1d68a..a0fd4af5 100644
--- a/apps/web/src/components/environment-manager/edit-environment-set-dialog.tsx
+++ b/apps/web/src/components/environment-manager/edit-environment-set-dialog.tsx
@@ -8,7 +8,7 @@ import { useIsMobile } from "@/components/hooks/use-mobile"
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
 import { Textarea } from "@/components/ui/textarea"
-import { Plus, Trash2 } from "lucide-react"
+import { Plus, Trash2, Eye, EyeOff } from "lucide-react"
 import {
     useEnvironmentManagerStore,
     type EnvSetEntry,
@@ -24,8 +24,10 @@ import { cn } from "@/lib/utils"
 import { toast } from "sonner"
 import { useTranslations } from "next-intl"
 
-function emptyVariable(): EnvVariableRow {
-    return { key: "", value: "" }
+type VarRow = EnvVariableRow & { _uid: string }
+
+function emptyVariable(): VarRow {
+    return { key: "", value: "", _uid: crypto.randomUUID() }
 }
 
 type EditEnvironmentSetDialogProps = {
@@ -39,9 +41,10 @@ export function EditEnvironmentSetDialog({ entry, open, onOpenChange }: EditEnvi
     const { encryptionKey } = useMasterKeyStore()
     const { updateSet } = useEnvironmentManagerStore()
     const [loading, setLoading] = useState(false)
+    const [showValues, setShowValues] = useState(false)
     const [project, setProject] = useState("")
     const [environment, setEnvironment] = useState("")
-    const [variables, setVariables] = useState<EnvVariableRow[]>([emptyVariable()])
+    const [variables, setVariables] = useState<VarRow[]>([emptyVariable()])
     const [tags, setTags] = useState<string[]>([])
     const [tagInput, setTagInput] = useState("")
     const [notes, setNotes] = useState("")
@@ -54,7 +57,12 @@ export function EditEnvironmentSetDialog({ entry, open, onOpenChange }: EditEnvi
         if (!entry || !open) return
         setProject(entry.project)
         setEnvironment(entry.environment)
-        setVariables(entry.variables.length ? [...entry.variables] : [emptyVariable()])
+        setVariables(
+            entry.variables.length
+                ? entry.variables.map((v) => ({ ...v, _uid: crypto.randomUUID() }))
+                : [emptyVariable()]
+        )
+        setShowValues(false)
         setTags([...entry.tags])
         setNotes(entry.notes)
         setTagInput("")
@@ -89,7 +97,9 @@ export function EditEnvironmentSetDialog({ entry, open, onOpenChange }: EditEnvi
             return
         }
 
-        const cleanedVars = variables.filter((r) => r.key.trim())
+        const cleanedVars = variables
+            .filter((r) => r.key.trim())
+            .map(({ key, value }) => ({ key, value }))
         const payload = { project: proj, environment: env, variables: cleanedVars, tags, notes }
 
         setLoading(true)
@@ -152,28 +162,55 @@ export function EditEnvironmentSetDialog({ entry, open, onOpenChange }: EditEnvi
                 plainCommentLines={plainCommentLines}
                 onPendingCommentedChange={setPendingCommented}
                 onPlainCommentLinesChange={setPlainCommentLines}
-                setVariables={setVariables}
-                emptyRow={emptyVariable()}
+                onMergeVariables={(incoming) =>
+                    setVariables((prev) => {
+                        const base = prev.filter((r) => r.key.trim() || r.value.trim())
+                        const keyIndex = new Map(base.map((r, i) => [r.key, i]))
+                        const result = [...base]
+                        for (const row of incoming) {
+                            const idx = keyIndex.get(row.key)
+                            if (idx !== undefined) {
+                                result[idx] = { ...row, _uid: result[idx]._uid }
+                            } else {
+                                keyIndex.set(row.key, result.length)
+                                result.push({ ...row, _uid: crypto.randomUUID() })
+                            }
+                        }
+                        return result.length > 0 ? result : [emptyVariable()]
+                    })
+                }
                 t={t as (key: string, values?: Record<string, string | number | boolean | Date>) => string}
             />
 
             <div className="space-y-2">
                 <div className="flex items-center justify-between">
                     <Label>{t("variables")}</Label>
-                    <Button
-                        type="button"
-                        variant="ghost"
-                        size="sm"
-                        className="h-8"
-                        onClick={() => setVariables((v) => [...v, emptyVariable()])}
-                    >
-                        <Plus className="h-4 w-4 mr-1" />
-                        {t("addRow")}
-                    </Button>
+                    <div className="flex items-center gap-1">
+                        <Button
+                            type="button"
+                            variant="ghost"
+                            size="sm"
+                            className="h-8 gap-1"
+                            onClick={() => setShowValues((v) => !v)}
+                        >
+                            {showValues ? <EyeOff className="h-3.5 w-3.5" /> : <Eye className="h-3.5 w-3.5" />}
+                            {showValues ? t("hideValues") : t("showValues")}
+                        </Button>
+                        <Button
+                            type="button"
+                            variant="ghost"
+                            size="sm"
+                            className="h-8"
+                            onClick={() => setVariables((v) => [...v, emptyVariable()])}
+                        >
+                            <Plus className="h-4 w-4 mr-1" />
+                            {t("addRow")}
+                        </Button>
+                    </div>
                 </div>
                 <div className="space-y-2 max-h-[240px] overflow-y-auto pr-1">
                     {variables.map((row, i) => (
-                        <div key={i} className="flex gap-2 items-start">
+                        <div key={row._uid} className="flex gap-2 items-start">
                             <Input
                                 placeholder={t("keyPlaceholder")}
                                 value={row.key}
@@ -187,7 +224,7 @@ export function EditEnvironmentSetDialog({ entry, open, onOpenChange }: EditEnvi
                             <Input
                                 placeholder={t("valuePlaceholder")}
                                 value={row.value}
-                                type="password"
+                                type={showValues ? "text" : "password"}
                                 className="font-mono text-sm flex-1 min-w-0"
                                 onChange={(e) => {
                                     const next = [...variables]
@@ -214,6 +251,7 @@ export function EditEnvironmentSetDialog({ entry, open, onOpenChange }: EditEnvi
                 <Label htmlFor="em-edit-notes">{t("notesOptional")}</Label>
                 <Textarea
                     id="em-edit-notes"
+                    placeholder={t("placeholderNotes")}
                     value={notes}
                     onChange={(e) => setNotes(e.target.value)}
                     className="min-h-[72px]"
diff --git a/apps/web/src/components/environment-manager/env-paste-collapsible.tsx b/apps/web/src/components/environment-manager/env-paste-collapsible.tsx
index 671ec46e..005ca0e8 100644
--- a/apps/web/src/components/environment-manager/env-paste-collapsible.tsx
+++ b/apps/web/src/components/environment-manager/env-paste-collapsible.tsx
@@ -22,8 +22,7 @@ type EnvPasteCollapsibleProps = {
     plainCommentLines: number
     onPendingCommentedChange: (rows: EnvVariableRow[]) => void
     onPlainCommentLinesChange: (n: number) => void
-    setVariables: React.Dispatch<React.SetStateAction<EnvVariableRow[]>>
-    emptyRow: EnvVariableRow
+    onMergeVariables: (incoming: EnvVariableRow[]) => void
     t: (key: string, values?: Record<string, string | number | boolean | Date>) => string
 }
 
@@ -36,8 +35,7 @@ export function EnvPasteCollapsible({
     plainCommentLines,
     onPendingCommentedChange,
     onPlainCommentLinesChange,
-    setVariables,
-    emptyRow,
+    onMergeVariables,
     t,
 }: EnvPasteCollapsibleProps) {
     const handlePaste = (e: React.ClipboardEvent<HTMLTextAreaElement>) => {
@@ -52,17 +50,16 @@ export function EnvPasteCollapsible({
         onPasteTextChange("")
 
         if (d.active.length > 0) {
-            setVariables((prev) => mergeEnvVariableRows(prev, d.active, emptyRow))
+            onMergeVariables(d.active)
             toast.success(t("toastPasteAutoMerged", { count: d.active.length }))
         } else {
             toast.info(t("toastPasteCommentedOnly"))
         }
-
     }
 
     const addCommentedVariables = () => {
         if (pendingCommented.length === 0) return
-        setVariables((prev) => mergeEnvVariableRows(prev, pendingCommented, emptyRow))
+        onMergeVariables(pendingCommented)
         toast.success(t("toastCommentedAdded", { count: pendingCommented.length }))
         onPendingCommentedChange([])
     }
diff --git a/apps/web/src/components/environment-manager/environment-set-list.tsx b/apps/web/src/components/environment-manager/environment-set-list.tsx
index 591caa40..40c2623f 100644
--- a/apps/web/src/components/environment-manager/environment-set-list.tsx
+++ b/apps/web/src/components/environment-manager/environment-set-list.tsx
@@ -1,6 +1,6 @@
 "use client"
 
-import { useMemo, useState } from "react"
+import { useMemo, useState, useEffect, useRef } from "react"
 import { highlightDotEnvSource } from "@/lib/hljs-dotenv"
 import "./dotenv-modal-highlighter.css"
 import { useEnvironmentManagerStore, type EnvSetEntry } from "@/store/environment-manager-store"
@@ -8,7 +8,7 @@ import { Input } from "@/components/ui/input"
 import { Button } from "@/components/ui/button"
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
 import { Badge } from "@/components/ui/badge"
-import { Search, Copy, Pencil, Trash2, FileCode2, Eye } from "lucide-react"
+import { Search, Copy, Pencil, Trash2, FileCode2, Eye, ArrowUpDown } from "lucide-react"
 import { toast } from "sonner"
 import { deleteEnvSetEntry } from "@/lib/environment-manager-api"
 import { formatDotEnv } from "@/lib/environment-manager-utils"
@@ -24,6 +24,18 @@ import {
     AlertDialogHeader,
     AlertDialogTitle,
 } from "@/components/ui/alert-dialog"
+import {
+    DropdownMenu,
+    DropdownMenuContent,
+    DropdownMenuItem,
+    DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu"
+import {
+    Tooltip,
+    TooltipContent,
+    TooltipProvider,
+    TooltipTrigger,
+} from "@/components/ui/tooltip"
 import { EditEnvironmentSetDialog } from "./edit-environment-set-dialog"
 import { formatDistanceToNow } from "date-fns"
 import { cn } from "@/lib/utils"
@@ -45,6 +57,19 @@ import {
 } from "@/components/ui/drawer"
 import { ScrollArea } from "@/components/ui/scroll-area"
 
+type SortOrder = "updatedDesc" | "updatedAsc" | "nameAsc"
+
+function useDebounce<T>(value: T, delay: number): T {
+    const [debounced, setDebounced] = useState(value)
+    const timer = useRef<ReturnType<typeof setTimeout> | null>(null)
+    useEffect(() => {
+        if (timer.current) clearTimeout(timer.current)
+        timer.current = setTimeout(() => setDebounced(value), delay)
+        return () => { if (timer.current) clearTimeout(timer.current) }
+    }, [value, delay])
+    return debounced
+}
+
 export function EnvironmentSetList() {
     const t = useTranslations("EnvironmentManager.list")
     const tToast = useTranslations("EnvironmentManager.toasts")
@@ -52,11 +77,13 @@ export function EnvironmentSetList() {
     const { copyToClipboard } = useCopyToClipboard()
     const [search, setSearch] = useState("")
     const [tagFilter, setTagFilter] = useState("")
+    const [sortOrder, setSortOrder] = useState<SortOrder>("updatedDesc")
     const [editing, setEditing] = useState<EnvSetEntry | null>(null)
     const [editOpen, setEditOpen] = useState(false)
-    const [deleteId, setDeleteId] = useState<string | null>(null)
+    const [deleteEntry, setDeleteEntry] = useState<EnvSetEntry | null>(null)
     const [viewingEntry, setViewingEntry] = useState<EnvSetEntry | null>(null)
     const isMobile = useIsMobile()
+    const debouncedSearch = useDebounce(search, 200)
 
     const allTags = useMemo(() => {
         const s = new Set<string>()
@@ -65,33 +92,42 @@ export function EnvironmentSetList() {
     }, [sets])
 
     const filtered = useMemo(() => {
-        const q = search.toLowerCase().trim()
+        const q = debouncedSearch.toLowerCase().trim()
         const tf = tagFilter.toLowerCase().trim()
-        return sets.filter((e) => {
+        const result = sets.filter((e) => {
             const matchTag =
                 !tf || e.tags.some((x) => x.toLowerCase().includes(tf)) || tf === e.project.toLowerCase()
             if (!q) return matchTag
-            const blob = `${e.project} ${e.environment} ${e.tags.join(" ")} ${e.notes}`.toLowerCase()
-            return matchTag && blob.includes(q)
+            const blob = `${e.project} ${e.environment} ${e.tags.join(" ")}`.toLowerCase()
+            const notesMatch = e.notes.toLowerCase().includes(q)
+            return matchTag && (blob.includes(q) || notesMatch)
+        })
+        return result.sort((a, b) => {
+            if (sortOrder === "updatedDesc") return b.updatedAt - a.updatedAt
+            if (sortOrder === "updatedAsc") return a.updatedAt - b.updatedAt
+            return `${a.project}/${a.environment}`.localeCompare(`${b.project}/${b.environment}`)
         })
-    }, [sets, search, tagFilter])
+    }, [sets, debouncedSearch, tagFilter, sortOrder])
 
-    const viewDotEnvRaw = viewingEntry ? formatDotEnv(viewingEntry.variables).trim() : ""
+    const viewDotEnvRaw = useMemo(
+        () => (viewingEntry ? formatDotEnv(viewingEntry.variables).trim() : ""),
+        [viewingEntry]
+    )
     const viewDotEnvHtml = useMemo(
         () => (viewDotEnvRaw ? highlightDotEnvSource(viewDotEnvRaw) : ""),
         [viewDotEnvRaw]
     )
 
     const confirmDelete = async () => {
-        if (!deleteId) return
+        if (!deleteEntry) return
         try {
-            await deleteEnvSetEntry(deleteId)
-            deleteSet(deleteId)
+            await deleteEnvSetEntry(deleteEntry.id)
+            deleteSet(deleteEntry.id)
             toast.success(tToast("deleted"))
         } catch {
             toast.error(tToast("deleteFailed"))
         } finally {
-            setDeleteId(null)
+            setDeleteEntry(null)
         }
     }
 
@@ -121,7 +157,7 @@ export function EnvironmentSetList() {
                         />
                     </div>
                     <Input
-                        className="sm:max-w-[200px]"
+                        className="sm:max-w-[180px]"
                         placeholder={t("tagFilterPlaceholder")}
                         value={tagFilter}
                         onChange={(e) => setTagFilter(e.target.value)}
@@ -132,104 +168,146 @@ export function EnvironmentSetList() {
                             <option key={tag} value={tag} />
                         ))}
                     </datalist>
+                    <DropdownMenu>
+                        <DropdownMenuTrigger asChild>
+                            <Button variant="outline" size="sm" className="gap-1.5 shrink-0 h-9">
+                                <ArrowUpDown className="h-3.5 w-3.5" />
+                                {t(`sort.${sortOrder}`)}
+                            </Button>
+                        </DropdownMenuTrigger>
+                        <DropdownMenuContent align="end">
+                            <DropdownMenuItem onClick={() => setSortOrder("updatedDesc")}>{t("sort.updatedDesc")}</DropdownMenuItem>
+                            <DropdownMenuItem onClick={() => setSortOrder("updatedAsc")}>{t("sort.updatedAsc")}</DropdownMenuItem>
+                            <DropdownMenuItem onClick={() => setSortOrder("nameAsc")}>{t("sort.nameAsc")}</DropdownMenuItem>
+                        </DropdownMenuContent>
+                    </DropdownMenu>
                 </div>
 
                 {isLoading ? (
                     <p className="text-muted-foreground text-sm">{t("loading")}</p>
-                ) : filtered.length === 0 ? (
+                ) : sets.length === 0 ? (
                     <div className="flex flex-col items-center justify-center py-16 text-center text-muted-foreground">
                         <FileCode2 className="h-12 w-12 mb-3 opacity-40" />
                         <p className="font-medium text-foreground">{t("emptyTitle")}</p>
                         <p className="text-sm mt-1 max-w-sm">{t("emptyHint")}</p>
                     </div>
+                ) : filtered.length === 0 ? (
+                    <div className="flex flex-col items-center justify-center py-16 text-center text-muted-foreground">
+                        <Search className="h-12 w-12 mb-3 opacity-40" />
+                        <p className="font-medium text-foreground">{t("noResultsTitle")}</p>
+                        <p className="text-sm mt-1 max-w-sm">{t("noResultsHint")}</p>
+                    </div>
                 ) : (
-                    <div className="grid gap-3 sm:grid-cols-2 lg:grid-cols-3 overflow-y-auto pb-4">
-                        {filtered.map((entry) => (
-                            <Card key={entry.id} className="flex flex-col">
-                                <CardHeader className="pb-2 space-y-1">
-                                    <CardTitle className="text-base leading-tight">
-                                        {entry.project}
-                                        <span className="text-muted-foreground font-normal"> / </span>
-                                        <span className="font-semibold">{entry.environment}</span>
-                                    </CardTitle>
-                                    <p className="text-xs text-muted-foreground">
-                                        {t("updatedAgo", {
-                                            time: formatDistanceToNow(entry.updatedAt, { addSuffix: true }),
-                                        })}
-                                    </p>
-                                </CardHeader>
-                                <CardContent className="flex-1 flex flex-col gap-3 pt-0">
-                                    {entry.tags.length > 0 && (
-                                        <div className="flex flex-wrap gap-1">
-                                            {entry.tags.map((tag) => (
-                                                <Badge key={tag} variant="secondary" className="text-xs">
-                                                    {tag}
-                                                </Badge>
-                                            ))}
+                    <TooltipProvider>
+                        <div className="grid gap-3 sm:grid-cols-2 lg:grid-cols-3 overflow-y-auto pb-4">
+                            {filtered.map((entry) => (
+                                <Card key={entry.id} className="flex flex-col">
+                                    <CardHeader className="pb-2 space-y-1">
+                                        <CardTitle className="text-base leading-tight">
+                                            {entry.project}
+                                            <span className="text-muted-foreground font-normal"> / </span>
+                                            <span className="font-semibold">{entry.environment}</span>
+                                        </CardTitle>
+                                        <p className="text-xs text-muted-foreground">
+                                            {t("updatedAgo", {
+                                                time: formatDistanceToNow(entry.updatedAt, { addSuffix: true }),
+                                            })}
+                                        </p>
+                                    </CardHeader>
+                                    <CardContent className="flex-1 flex flex-col gap-3 pt-0">
+                                        {entry.tags.length > 0 && (
+                                            <div className="flex flex-wrap gap-1">
+                                                {entry.tags.map((tag) => (
+                                                    <Badge
+                                                        key={tag}
+                                                        variant="secondary"
+                                                        className="text-xs cursor-pointer hover:bg-primary/10"
+                                                        onClick={() => setTagFilter(tag)}
+                                                    >
+                                                        {tag}
+                                                    </Badge>
+                                                ))}
+                                            </div>
+                                        )}
+                                        <p className="text-sm text-muted-foreground">
+                                            {t("variableCount", {
+                                                count: entry.variables.filter((v) => v.key.trim()).length,
+                                            })}
+                                        </p>
+                                        {entry.notes.trim() && (
+                                            <p className="text-xs text-muted-foreground line-clamp-2">{entry.notes}</p>
+                                        )}
+                                        <div className="flex gap-1 mt-auto pt-2">
+                                            <Tooltip>
+                                                <TooltipTrigger asChild>
+                                                    <Button
+                                                        type="button"
+                                                        variant="outline"
+                                                        size="icon"
+                                                        className="h-8 w-8"
+                                                        onClick={() =>
+                                                            copyToClipboard(
+                                                                formatDotEnv(entry.variables),
+                                                                tToast("copiedDotEnv")
+                                                            )
+                                                        }
+                                                    >
+                                                        <Copy className="h-3.5 w-3.5" />
+                                                    </Button>
+                                                </TooltipTrigger>
+                                                <TooltipContent>{t("copyDotEnv")}</TooltipContent>
+                                            </Tooltip>
+                                            <Tooltip>
+                                                <TooltipTrigger asChild>
+                                                    <Button
+                                                        type="button"
+                                                        variant="outline"
+                                                        size="icon"
+                                                        className="h-8 w-8"
+                                                        onClick={() => setViewingEntry(entry)}
+                                                    >
+                                                        <Eye className="h-3.5 w-3.5" />
+                                                    </Button>
+                                                </TooltipTrigger>
+                                                <TooltipContent>{t("view")}</TooltipContent>
+                                            </Tooltip>
+                                            <Tooltip>
+                                                <TooltipTrigger asChild>
+                                                    <Button
+                                                        type="button"
+                                                        variant="ghost"
+                                                        size="icon"
+                                                        className="h-8 w-8"
+                                                        onClick={() => {
+                                                            setEditing(entry)
+                                                            setEditOpen(true)
+                                                        }}
+                                                    >
+                                                        <Pencil className="h-3.5 w-3.5" />
+                                                    </Button>
+                                                </TooltipTrigger>
+                                                <TooltipContent>{t("edit")}</TooltipContent>
+                                            </Tooltip>
+                                            <Tooltip>
+                                                <TooltipTrigger asChild>
+                                                    <Button
+                                                        type="button"
+                                                        variant="ghost"
+                                                        size="icon"
+                                                        className="h-8 w-8 text-destructive hover:text-destructive ml-auto"
+                                                        onClick={() => setDeleteEntry(entry)}
+                                                    >
+                                                        <Trash2 className="h-3.5 w-3.5" />
+                                                    </Button>
+                                                </TooltipTrigger>
+                                                <TooltipContent>{t("delete")}</TooltipContent>
+                                            </Tooltip>
                                         </div>
-                                    )}
-                                    <p className="text-sm text-muted-foreground">
-                                        {t("variableCount", {
-                                            count: entry.variables.filter((v) => v.key.trim()).length,
-                                        })}
-                                    </p>
-                                    {entry.notes.trim() && (
-                                        <p className="text-xs text-muted-foreground line-clamp-2">{entry.notes}</p>
-                                    )}
-                                    <div className="flex flex-wrap gap-2 mt-auto pt-2">
-                                        <Button
-                                            type="button"
-                                            variant="outline"
-                                            size="sm"
-                                            className="gap-1"
-                                            onClick={() =>
-                                                copyToClipboard(
-                                                    formatDotEnv(entry.variables),
-                                                    tToast("copiedDotEnv")
-                                                )
-                                            }
-                                        >
-                                            <Copy className="h-3.5 w-3.5" />
-                                            {t("copyDotEnv")}
-                                        </Button>
-                                        <Button
-                                            type="button"
-                                            variant="outline"
-                                            size="sm"
-                                            className="gap-1"
-                                            onClick={() => setViewingEntry(entry)}
-                                        >
-                                            <Eye className="h-3.5 w-3.5" />
-                                            {t("view")}
-                                        </Button>
-                                        <Button
-                                            type="button"
-                                            variant="ghost"
-                                            size="sm"
-                                            className="gap-1"
-                                            onClick={() => {
-                                                setEditing(entry)
-                                                setEditOpen(true)
-                                            }}
-                                        >
-                                            <Pencil className="h-3.5 w-3.5" />
-                                            {t("edit")}
-                                        </Button>
-                                        <Button
-                                            type="button"
-                                            variant="ghost"
-                                            size="sm"
-                                            className="gap-1 text-destructive hover:text-destructive"
-                                            onClick={() => setDeleteId(entry.id)}
-                                        >
-                                            <Trash2 className="h-3.5 w-3.5" />
-                                            {t("delete")}
-                                        </Button>
-                                    </div>
-                                </CardContent>
-                            </Card>
-                        ))}
-                    </div>
+                                    </CardContent>
+                                </Card>
+                            ))}
+                        </div>
+                    </TooltipProvider>
                 )}
             </div>
 
@@ -310,7 +388,7 @@ export function EnvironmentSetList() {
                 </Drawer>
             ) : (
                 <Dialog open={!!viewingEntry} onOpenChange={(o) => !o && setViewingEntry(null)}>
-                    <DialogContent className="flex h-[min(92vh,920px)] w-[min(95vw,1320px)] max-w-[min(95vw,1320px)] max-h-[min(92vh,920px)] flex-col gap-0 overflow-hidden p-0 sm:max-w-[min(95vw,1320px)]">
+                    <DialogContent className="flex h-[min(92vh,800px)] w-[min(95vw,780px)] max-w-[min(95vw,780px)] max-h-[min(92vh,800px)] flex-col gap-0 overflow-hidden p-0 sm:max-w-[min(95vw,780px)]">
                         {viewingEntry && (
                             <>
                                 <DialogHeader className="shrink-0 space-y-1 px-6 pb-2 pt-6 text-left">
@@ -376,11 +454,19 @@ export function EnvironmentSetList() {
                 </Dialog>
             )}
 
-            <AlertDialog open={!!deleteId} onOpenChange={(o) => !o && setDeleteId(null)}>
+            <AlertDialog open={!!deleteEntry} onOpenChange={(o) => !o && setDeleteEntry(null)}>
                 <AlertDialogContent>
                     <AlertDialogHeader>
                         <AlertDialogTitle>{t("deleteDialogTitle")}</AlertDialogTitle>
-                        <AlertDialogDescription>{t("deleteDialogDescription")}</AlertDialogDescription>
+                        <AlertDialogDescription>
+                            {deleteEntry && (
+                                <span>
+                                    <strong>{deleteEntry.project} / {deleteEntry.environment}</strong>
+                                    {" — "}
+                                </span>
+                            )}
+                            {t("deleteDialogDescription")}
+                        </AlertDialogDescription>
                     </AlertDialogHeader>
                     <AlertDialogFooter>
                         <AlertDialogCancel>{t("cancel")}</AlertDialogCancel>
diff --git a/apps/web/src/lib/environment-manager-utils.ts b/apps/web/src/lib/environment-manager-utils.ts
index 5f59a1ed..db7b8364 100644
--- a/apps/web/src/lib/environment-manager-utils.ts
+++ b/apps/web/src/lib/environment-manager-utils.ts
@@ -77,8 +77,18 @@ export function mergeEnvVariableRows(
     emptyRow: EnvVariableRow
 ): EnvVariableRow[] {
     const base = prev.filter((r) => r.key.trim() || r.value.trim())
-    const merged = [...base, ...incoming]
-    return merged.length > 0 ? merged : [emptyRow]
+    const keyIndex = new Map(base.map((r, i) => [r.key, i]))
+    const result = [...base]
+    for (const row of incoming) {
+        const idx = keyIndex.get(row.key)
+        if (idx !== undefined) {
+            result[idx] = row
+        } else {
+            keyIndex.set(row.key, result.length)
+            result.push(row)
+        }
+    }
+    return result.length > 0 ? result : [emptyRow]
 }
 
 export function parseDotEnvBlock(text: string): EnvVariableRow[] {