diff --git a/_board/raspberry_pi_pico_w.md b/_board/raspberry_pi_pico_w.md
index 86928ee51..5c06cf566 100644
--- a/_board/raspberry_pi_pico_w.md
+++ b/_board/raspberry_pi_pico_w.md
@@ -8,6 +8,9 @@ board_url: "https://www.adafruit.com/product/5526"
 board_image: "raspberry_pi_pico_w.jpg"
 date_added: 2022-10-2
 family: raspberrypi
+tags:
+  - picow
+  - 🥧🐮
 features:
   - Breadboard-Friendly
 ---
diff --git a/assets/javascript/downloads.js b/assets/javascript/downloads.js
index f8ad34e12..eff6c2ea6 100644
--- a/assets/javascript/downloads.js
+++ b/assets/javascript/downloads.js
@@ -421,8 +421,17 @@ function shouldDisplayDownload(download, displayedManufacturers, displayedMcufam
 
   if (downloadsSearch.searchTerm && downloadsSearch.searchTerm.length > 0 && shouldDisplay) {
     var regex = new RegExp(downloadsSearch.searchTerm, "gi");
-    var haystack = download.dataset.name + " " + download.dataset.id + " " + download.dataset.manufacturer + " " + download.dataset.mcufamily + " " + download.dataset.features;
-
+    var dataFields = [
+        download.dataset.name,
+        download.dataset.id,
+        download.dataset.manufacturer,
+        download.dataset.mcufamily,
+        download.dataset.features,
+        download.dataset.tags,
+        download.dataset.modules,
+    ];
+
+    var haystack = dataFields.join(" ");
     shouldDisplay = haystack.match(regex);
   }
 
diff --git a/downloads.html b/downloads.html
index 2af16c481..637b5be42 100644
--- a/downloads.html
+++ b/downloads.html
@@ -104,6 +104,17 @@ <h1>Downloads</h1>
 
       {% assign info = info[0] %}
 
+      {% assign stable = board.versions | where: "stable", true | sort: "version" %}
+      {% assign unstable = board.versions | where: "stable", false | sort: "version" %}
+      {% if stable[0].modules and unstable[0].modules %}
+        {% assign modules = stable[0].modules | concat: unstable[0].modules | uniq %}
+      {% elsif stable[0].modules %}
+        {% assign modules = stable[0].modules %}
+      {% elsif unstable[0].modules %}
+        {% assign modules = unstable[0].modules %}
+      {% else %}
+        {% assign modules = '' | split: '' %}
+      {% endif %}
       {% if info.downloads_display == false %}
         {% continue %}
       {% endif %}
@@ -120,6 +131,8 @@ <h1>Downloads</h1>
                             data-manufacturer="{{ info.manufacturer }}"
                             data-mcufamily="{{ info.family }}"
                             data-features="{{ info.features | join: ','}}"
+                            data-tags="{{ info.tags | join: ','}}"
+                            data-modules="{{ modules | join: ', ' }}"
                             data-date="{{ info.date_added }}">
         <a href="{{ download_url | relative_url }}">
           <div>
@@ -151,6 +164,7 @@ <h3>{{ info_name | default: board.id }}</h3>
                               data-manufacturer="{{ board.manufacturer }}"
                               data-mcufamily="{{ board.family }}"
                               data-features="{{ board.features | join: ','}}"
+                              data-tags="{{ info.tags | join: ','}}"
                               data-date="{{ board.date_added }}">
           <a href="{{ board.url | relative_url }}">
             <div>