diff --git a/components/content/StructureDb.vue b/components/content/StructureDb.vue
index dc515c0fdbcaf3248b662f1a326602853eea28f9..5cbd960233f326669e60178dc5728741b6d36a8e 100644
--- a/components/content/StructureDb.vue
+++ b/components/content/StructureDb.vue
@@ -54,14 +54,20 @@ function pdbNameToCif(pdbPath: string) {
     return `${cifPath}.cif`
 }
 
-
 function toSystemName(rawName: string) {
-    // split on __ in system_genes
-    return rawName.split("__")[0].toLocaleLowerCase()   
+    // split on -0 if exists else on _
+    if (rawName.includes("-0")) {
+
+        return rawName.split("-0")[0].toLocaleLowerCase()
+    } else {
+        return rawName.split("_")[0].toLocaleLowerCase()
+    }
+
 
 }
 
 
+
 const plddtDistribution = computed(() => {
     if (toValue(msResult)?.facetDistribution?.plddts) {
         return Object.entries(toValue(msResult).facetDistribution.plddts).map(([key, value]) => { })
@@ -94,7 +100,7 @@ function remove(key) {
         </template>
         <template #[`item.structure`]="{ item }">
             <MolstarPdbePlugin v-if="item?.pdb && item.pdb !== 'na'"
-                :data-urls="[`/${toSystemName(item.system_genes)}/${pdbNameToCif(item.pdb)}`]" uniq>
+                :data-urls="[`/${toSystemName(item.system)}/${pdbNameToCif(item.pdb)}`]" uniq>
             </MolstarPdbePlugin>
             <span v-else class="d-flex flex-wrap align-center justify-center">
                 <v-icon color="warning" icon="md:dangerous"></v-icon>