diff --git a/components/content/RefseqDb.vue b/components/content/RefseqDb.vue
index 44f9e1ee0c2adcb091ef5fca2375825b18892e50..2093c06dc1c1e92d59d5ea475b8d7deb2bc6e17b 100644
--- a/components/content/RefseqDb.vue
+++ b/components/content/RefseqDb.vue
@@ -109,11 +109,11 @@ const selectedTaxoRank = ref("phylum");
 const headers = ref([
     { title: "Replicon", key: "replicon" },
     {
-        title: "Type",
+        title: "System",
         key: "type",
     },
     {
-        title: "Subtype",
+        title: "Subsystem",
         key: "subtype",
     },
     {
@@ -271,7 +271,7 @@ function namesToAccessionChips(names: string[]) {
     return namesToCollapsibleChips(names).map(it => {
         return {
             ...it,
-            // href: new URL(it.title, "http://toto.pasteur.cloud").toString()
+            href: new URL(it.title, "https://www.ncbi.nlm.nih.gov/protein/").toString()
         }
     })
 }
@@ -473,6 +473,17 @@ async function downloadPng(component: ComponentPublicInstance | null, filename:
                     <CollapsibleChips :items="namesToAccessionChips(item.accession_in_sys)">
                     </CollapsibleChips>
                 </template>
+                <template #[`item.type`]="{ item }">
+                    <v-chip color="primary" variant="text" :to="`/defense-systems/${item.type.toLowerCase()}`" target="_blank"> {{
+                        item.type }}
+                    </v-chip>
+                </template>
+
+                <template #[`item.subtype`]="{ item }">
+                    <v-chip color="primary" variant="text" :to="`/defense-systems/${item.type.toLowerCase()}`" target="_blank"> {{
+                        item.subtype }}
+                    </v-chip>
+                </template>
             </ServerDbTable>