diff --git a/templates/js/buildPage.js b/templates/js/buildPage.js
index fe446ad..0d0081c 100644
--- a/templates/js/buildPage.js
+++ b/templates/js/buildPage.js
@@ -149,7 +149,10 @@ function buildResults() {
selectedLicenses
);
sortThemes(filteredThemes, sortedBy);
- filteredThemes.forEach((theme) => addThemeTableRow(theme, selectedColumns));
+ // from buildThemeTableRow.js
+ filteredThemes.forEach((theme) =>
+ addThemeTableRow(theme, selectedColumns, selectedTags)
+ );
// from buildSelectionMenu.js
buildSelectionMenu(
diff --git a/templates/js/buildThemeTableRow.js b/templates/js/buildThemeTableRow.js
index 95b6734..4cd4e29 100644
--- a/templates/js/buildThemeTableRow.js
+++ b/templates/js/buildThemeTableRow.js
@@ -1,4 +1,4 @@
-function addThemeTableRow(theme, selectedColumns) {
+function addThemeTableRow(theme, selectedColumns, selectedTags) {
let resultsTable = document.getElementById("resultsTable");
let resultsTableRow = document.createElement("tr");
@@ -53,7 +53,13 @@ function addThemeTableRow(theme, selectedColumns) {
let tagsTD = document.createElement("td");
let tL = theme.tags.length - 1;
tL += theme.tags.map((x) => x.length).reduce((a, b) => a + b, 0);
- tagsTD.innerHTML = theme.tags;
+ let sTags = theme.tags.filter((x) => selectedTags.includes(x));
+ let nsTags = theme.tags.filter((x) => !selectedTags.includes(x));
+ if (sTags.length > 0 && nsTags.length > 0) {
+ tagsTD.innerHTML = `${sTags},${nsTags}`;
+ } else {
+ tagsTD.innerHTML = `${sTags}${nsTags}`;
+ }
tagsTD.style.minWidth = `${tL / 7}rem`;
resultsTableRow.appendChild(tagsTD);
}