diff --git a/templates/js/buildPage.js b/templates/js/buildPage.js
index acc3def..136be3d 100644
--- a/templates/js/buildPage.js
+++ b/templates/js/buildPage.js
@@ -125,9 +125,9 @@ function buildResults() {
   resultsTable.appendChild(resultsTableHeadRow);
   let selectedColumns = getSelectedColumns();
 
-  let selectedTags = getSelected("tag");
-  let selectedFeatures = getSelected("feature");
-  let selectedLicenses = getSelected("license");
+  let selectedTags = getSelected("tag").map(x => x.slice(0,-4));
+  let selectedFeatures = getSelected("feature").map(x => x.slice(0,-8));
+  let selectedLicenses = getSelected("license").map(x => x.slice(0,-8));
   let selectedMinVer = getSelected("minVerRadioButton");
   let sortedBy = getSortBy();
   let minVerFilteredThemes = getMinVerFilteredThemes(selectedMinVer);
diff --git a/templates/js/buildSelectionInputs.js b/templates/js/buildSelectionInputs.js
index f4b097a..b7a32f6 100644
--- a/templates/js/buildSelectionInputs.js
+++ b/templates/js/buildSelectionInputs.js
@@ -24,17 +24,17 @@ function buildInput(item, selected, inpParent) {
   };
 
   if ("feature" in item) {
-    selectionInput.value = item.feature;
+    selectionInput.value = `${item.feature}-feature`;
     inputSelectionButton.style.width = "15rem";
     selectionInputLabel.innerHTML = `${item.feature} (${item.num_themes})`;
     selectionInput.classList.add("featureSelectionInput");
   } else if ("tag" in item) {
-    selectionInput.value = item.tag;
+    selectionInput.value = `${item.tag}-tag`;
     inputSelectionButton.style.width = "12rem";
     selectionInputLabel.innerHTML = `${item.tag} (${item.num_themes})`;
     selectionInput.classList.add("tagSelectionInput");
   } else if ("license" in item) {
-    selectionInput.value = item.license;
+    selectionInput.value = `${item.license}-license`;
     inputSelectionButton.style.width = "15rem";
     selectionInputLabel.innerHTML = `${item.license} (${item.num_themes})`;
     selectionInput.classList.add("licenseSelectionInput");