diff --git a/.gitignore b/.gitignore
index 0ad8de66b3..a6f8d1d7c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ site/
 venv*
 scripts/available_software/__pycache__
 scripts/available_software/tests/__pycache__
+docs/available_software/__pycache__
 test-suite
diff --git a/docs/available_software/javascripts/software-filter.js b/docs/available_software/javascripts/software-filter.js
index 727d58f895..eea3663e7e 100644
--- a/docs/available_software/javascripts/software-filter.js
+++ b/docs/available_software/javascripts/software-filter.js
@@ -6,13 +6,27 @@ document.addEventListener("DOMContentLoaded", () => {
   const cards = document.querySelectorAll(".software-card");
 
   input.addEventListener("input", () => {
-    const q = input.value.toLowerCase();
+    const q = [...input.value.matchAll(/"([^"]+)"|(\S+)/g)]
+      .map(m => (m[1] || m[2]).toLowerCase());
 
     cards.forEach(card => {
       const li = card.closest("li");
       const text = card.dataset.search.toLowerCase();
-      li.style.display = text.includes(q) ? "" : "none";
+      li.style.display = q.every(term => text.includes(term)) ? "" : "none";
     });
+
+    const url = new URL(window.location);
+    if (input.value) {
+      url.searchParams.set("search", input.value);
+    } else {
+      url.searchParams.delete("search");
+    }
+    history.replaceState(null, "", url);
   });
-});
 
+  const search = new URLSearchParams(window.location.search).get("search");
+  if (search) {
+    input.value = search;
+    input.dispatchEvent(new Event("input"));
+  }
+});
diff --git a/docs/repositories/versions.md b/docs/repositories/versions.md
index 09dc4217b7..f5053747aa 100644
--- a/docs/repositories/versions.md
+++ b/docs/repositories/versions.md
@@ -8,15 +8,17 @@ Going forward, EESSI aims to have yearly version releases, which will target a m
 
 ## Current EESSI versions
 
-| EESSI Version       | Included toolchains                    | Software list                                                     |
-| ------------------- | -------------------------------------- | ----------------------------------------------------------------- |
-| 2023.06 (default)   | `foss/2022b` `foss/2023a` `foss/2023b` | [2023.06](https://www.eessi.io/docs/available_software/overview/) |
-| 2025.06             | `foss/2024a` `foss/2025a`              | Coming Soon                                                       |
+| EESSI Version       | Included toolchains                    | Software list                                       |
+| ------------------- | -------------------------------------- | --------------------------------------------------- |
+| 2023.06 (default)   | `foss/2022b` `foss/2023a` `foss/2023b` | [2023.06](../../available_software/?search=2023.06) |
+| 2025.06             | `foss/2024a` `foss/2025a` `foss/2025b` | [2025.06](../../available_software/?search=2025.06) |
+| 2026.06             | `foss/2026.1`                          | (under development)                                 |
 
-The current default EESSI version is `2023.06`. Version `2025.06` is already fully available and will be made the default soon, once it contains more software. 
+The current default EESSI version is `2023.06`. However such a default for EESSI has little real meaning, version `2025.06` is already fully available 
+with new software added regularly and the development effort for EESSI `2026.06` is already underway.
 
 ## Switching between EESSI versions
 
 * The simplest way to load a specific EESSI version or to switch between them, is to load the appropriate environment module. To access version `2023.06` one can simply do `module load EESSI/2023.06` and switching to the `2025.06` version is just as easy with: `module load EESSI/2025.06`. This will automatically set up the environment and avoid conflicts between versions.
 
-[^1]: technically: a specific commit, since Gentoo Prefix doesn't have versioned releases.
\ No newline at end of file
+[^1]: technically: a specific commit, since Gentoo Prefix doesn't have versioned releases.