diff --git a/src/App.vue b/src/App.vue
index 45811391a9108b8c78fc1a2c12667bea939ab3e9..202b5a008e4674a6cddf97e52cd224f723a1eede 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -723,23 +723,23 @@ export default {
 
       var uniprot_assayTarget = fields.getField("1-Uniprot");
       uniprot_assayTarget.label = "Assay Target Uniprot record";
-      uniprot_assayTarget.subjectType = "AssayTarget_uniprot";
-      uniprot_assayTarget.type = "skos:Concept";
+
+      uniprot_assayTarget.type = "pharmaWien:uniprot_protein_assayTarget";
       uniprot_assayTarget.category = ["assayTarget"];
       var isoform_assayTarget = fields.getField("1-Isoform");
       isoform_assayTarget.label = "Assay Target Isoform";
-      isoform_assayTarget.subjectType = "AssayTarget_isoform";
-      isoform_assayTarget.type = "AssayTarget_isoform";
+
+      isoform_assayTarget.type = "pharmaWien:isoform_protein_assayTarget";
       isoform_assayTarget.category = ["assayTarget"];
       var seqAlt_assayTarget = fields.getField("1-Protein-sequence-alteration");
       seqAlt_assayTarget.label = "Assay Target Protein sequence alteration";
-      seqAlt_assayTarget.subjectType = "AssayTarget_seqAlt";
-      seqAlt_assayTarget.type = "AssayTarget_seqAlt";
+
+      seqAlt_assayTarget.type = "pharmaWien:seqAlt_protein_assayTarget";
       seqAlt_assayTarget.category = ["assayTarget"];
       var protMod_assayTarget = fields.getField("1-Protein-modification");
       protMod_assayTarget.label = "Assay Target Protein Modification";
-      protMod_assayTarget.subjectType = "AssayTargetprotMod";
-      protMod_assayTarget.type = "AssayTargetprotMod";
+
+      protMod_assayTarget.type = "pharmaWien:protMod_protein_assayTarget";
       protMod_assayTarget.category = ["assayTarget"];
       this.form.sections[2].categories[2].fields.push(uniprot_assayTarget);
       this.form.sections[2].categories[2].fields.push(isoform_assayTarget);
@@ -748,49 +748,49 @@ export default {
 
       var gene_assayTarget = fields.getField("1-Entrez-gene-ID");
       gene_assayTarget.label = "Assay Target Entrez Gene ID";
-      gene_assayTarget.subjectType = "AssayTarget_geneId";
-      gene_assayTarget.type = "AssayTarget_geneId";
+
+      gene_assayTarget.type = "pharmaWien:geneId_gene_assayTarget";
       gene_assayTarget.category = ["assayTarget"];
       var geneMod_assayTarget = fields.getField("1-Gene-modification");
       geneMod_assayTarget.label = "Assay Target Gene Modification";
-      geneMod_assayTarget.subjectType = "AssayTarget_geneMod";
-      geneMod_assayTarget.type = "AssayTarget_geneMod";
+
+      geneMod_assayTarget.type = "pharmaWien:geneMod_gene_assaytarget";
       geneMod_assayTarget.category = ["assayTarget"];
       this.form.sections[2].categories[2].fields.push(gene_assayTarget);
       this.form.sections[2].categories[2].fields.push(geneMod_assayTarget);
 
       var nacid_assayTarget = fields.getField("1-Nucleic-acid-type");
       nacid_assayTarget.label = "Assay Target Nucleic Acid Type";
-      nacid_assayTarget.subjectType = "AssayTarget_nucleic_acid";
-      nacid_assayTarget.type = "skos:Concept";
+
+      nacid_assayTarget.type = "pharmaWien:type_nucleicAcid_assayTarget";
       nacid_assayTarget.category = ["assayTarget"];
       nacid_assayTarget.description = "Nucleic Acid";
       var refSeq_assayTarget = fields.getField("1-RefSeq-accession");
       refSeq_assayTarget.label = "Assay Target RefSeq accession:";
-      refSeq_assayTarget.subjectType = "AssayTarget_refSeq";
-      refSeq_assayTarget.type = "AssayTarget_refSeq";
+
+      refSeq_assayTarget.type = "pharmaWien:refSeq_nucleicAcid_assayTarget";
       refSeq_assayTarget.category = ["assayTarget"];
       refSeq_assayTarget.description = "Nucleic Acid";
       this.form.sections[2].categories[2].fields.push(nacid_assayTarget);
       this.form.sections[2].categories[2].fields.push(refSeq_assayTarget);
       var PFAM_assayTarget = fields.getField("1-PFAM-accession");
       PFAM_assayTarget.label = "Assay Target PFAM accession number";
-      PFAM_assayTarget.subjectType = "AssayTarget_PFAM";
-      PFAM_assayTarget.type = "AssayTarget_PFAM";
+
+      PFAM_assayTarget.type = "pharmaWien:PFAM_assayTarget";
       PFAM_assayTarget.category = ["assayTarget"];
       this.form.sections[2].categories[2].fields.push(PFAM_assayTarget);
 
       var uniprotsub_assayTarget = fields.getField("1-Uniprot");
       uniprotsub_assayTarget.label =
         "Assay Target Protein Subunit Uniprot record";
-      uniprotsub_assayTarget.subjectType = "AssayTarget_uniprot_subunit";
-      uniprotsub_assayTarget.type = "skos:Concept";
+
+      uniprotsub_assayTarget.type = "pharmaWien:uniprot_protSub_assayTarget";
       uniprotsub_assayTarget.category = ["assayTarget"];
       uniprotsub_assayTarget.description = "Protein Subunit";
       var isoformsub_assayTarget = fields.getField("1-Isoform");
       isoformsub_assayTarget.label = "Assay Target Protein Subunit Isoform";
-      isoformsub_assayTarget.subjectType = "AssayTarget_isoform_subunit";
-      isoformsub_assayTarget.type = "AssayTarget_isoform_subunit";
+
+      isoformsub_assayTarget.type = "pharmaWien:isoform_protSub_assayTarget";
       isoformsub_assayTarget.category = ["assayTarget"];
       isoformsub_assayTarget.description = "Protein Subunit";
       var seqAltsub_assayTarget = fields.getField(
@@ -798,13 +798,13 @@ export default {
       );
       seqAltsub_assayTarget.label =
         "Assay Target Protein Subunit sequence alteration";
-      seqAltsub_assayTarget.subjectType = "AssayTarget_seqAlt_subunit";
+      seqAltsub_assayTarget.type = "pharmaWien:seqAlt_protSub_assayTarget";
       seqAltsub_assayTarget.category = ["assayTarget"];
       seqAltsub_assayTarget.description = "Protein Subunit";
       var protModsub_assayTarget = fields.getField("1-Protein-modification");
       protModsub_assayTarget.label =
         "Assay Target Protein Subunit modification";
-      protModsub_assayTarget.subjectType = "AssayTargetprotMod_subunit";
+      protModsub_assayTarget.type = "pharmaWien:protMod_protSub_assayTarget";
       protModsub_assayTarget.category = ["assayTarget"];
       protModsub_assayTarget.description = "Protein Subunit";
       this.form.sections[2].categories[2].fields.push(uniprotsub_assayTarget);
@@ -816,7 +816,8 @@ export default {
       );
       protcomplex_assayTarget.label =
         "Assay Target Protein Complex-Portal Accession";
-      protcomplex_assayTarget.subjectType = "AssayTarget_proteincompex";
+      protcomplex_assayTarget.type =
+        "pharmaWien:portalAcc_protComplex_assayTarget";
       protcomplex_assayTarget.category = ["assayTarget"];
       this.form.sections[2].categories[2].fields.push(protcomplex_assayTarget);
       this.form.sections[2].categories[2].fields.push(
@@ -824,8 +825,8 @@ export default {
       );
       var lipid_assayTarget = fields.getField("1-Lipid");
       lipid_assayTarget.label = "Assay Target Lipid";
-      lipid_assayTarget.type = "skos:Concept";
-      lipid_assayTarget.subjectType = "Lipid_assayTarget";
+      lipid_assayTarget.type = "pharmaWien:lipid_assayTarget";
+
       lipid_assayTarget.category = ["assayTarget"];
 
       this.form.sections[2].categories[2].fields.push(lipid_assayTarget);
@@ -878,8 +879,8 @@ export default {
       );
       var cell_line_assayTarget = fields.getField("0-cell-line");
       cell_line_assayTarget.label = "Assay Target Cell line (cellosaurus)";
-      cell_line_assayTarget.type = "skos:Concept";
-      cell_line_assayTarget.subjectType = "cell_line_assayTarget";
+      cell_line_assayTarget.type = "pharmaWien:cellosaurus_assayTarget";
+
       cell_line_assayTarget.visible = false;
       cell_line_assayTarget.category = ["assayTarget"];
       this.form.sections[2].categories[2].fields.push(cell_line_assayTarget);
@@ -1023,12 +1024,12 @@ export default {
       this.form.sections[2].categories[6].fields.push(
         fields.getField("6-Chemical-entities")
       );
-     // this.form.sections[2].categories[6].fields.push(
-     //   fields.getField("6-Atom")
-     // );
-     // this.form.sections[2].categories[6].fields.push(
-     //   fields.getField("6-chemical-substance")
-     // );
+      // this.form.sections[2].categories[6].fields.push(
+      //   fields.getField("6-Atom")
+      // );
+      // this.form.sections[2].categories[6].fields.push(
+      //   fields.getField("6-chemical-substance")
+      // );
       this.form.sections[2].categories[6].fields.push(
         fields.getField("6-Role")
       );
diff --git a/src/store/modules/vocabulary.js b/src/store/modules/vocabulary.js
index 819dcb868dfe6eb0db29140235d9eae321e8c0d7..7b638d212b847b1475ab7200be23e1859427f101 100644
--- a/src/store/modules/vocabulary.js
+++ b/src/store/modules/vocabulary.js
@@ -180,7 +180,7 @@ const state = {
     bioassay_type: {
       terms: [
         {
-          "@type": "assay_type",
+          "@type": "pharmaWien:assaytype",
           "skos:prefLabel": [
             {
               "@value": "ADMET",
@@ -190,7 +190,7 @@ const state = {
           "skos:exactMatch": ["http://www.bioassayontology.org/bao#BAO_0000009"]
         },
         {
-          "@type": "assay_type",
+          "@type": "pharmaWien:assaytype",
           "skos:prefLabel": [
             {
               "@value": "Binding type",
@@ -200,7 +200,7 @@ const state = {
           "skos:exactMatch": ["http://www.bioassayontology.org/bao#BAO_0000041"]
         },
         {
-          "@type": "assay_type",
+          "@type": "pharmaWien:assaytype",
           "skos:prefLabel": [
             {
               "@value": "Functional",
@@ -210,7 +210,7 @@ const state = {
           "skos:exactMatch": ["http://www.bioassayontology.org/bao#BAO_0000010"]
         },
         {
-          "@type": "assay_type",
+          "@type": "pharmaWien:assaytype",
           "skos:prefLabel": [
             {
               "@value": "Physicochemical",
@@ -220,7 +220,7 @@ const state = {
           "skos:exactMatch": ["http://www.bioassayontology.org/bao#BAO_0002810"]
         },
         {
-          "@type": "assay_type",
+          "@type": "pharmaWien:assaytype",
           "skos:prefLabel": [
             {
               "@value": "Phenotype characterization",
@@ -235,7 +235,7 @@ const state = {
     anatomical_category: {
       terms: [
         {
-          "@type": "skos:Concept",
+          "@type": "pharmaWien:anatomicalCategory",
           "skos:prefLabel": [
             {
               "@value": "Anatomical entity, cross species",
@@ -245,28 +245,28 @@ const state = {
           "skos:exactMatch": ["http://purl.obolibrary.org/obo/UBERON_0001062"]
         },
         {
-          "@type": "skos:Concept",
+          "@type": "pharmaWien:anatomicalCategory",
           "skos:prefLabel": [
             { "@value": "Plant anatomical entity", "@language": "eng" }
           ],
           "skos:exactMatch": ["http://purl.obolibrary.org/obo/PO_0025131"]
         },
         {
-          "@type": "skos:Concept",
+          "@type": "pharmaWien:anatomicalCategory",
           "skos:prefLabel": [
             { "@value": "Anatomical entity, fungi", "@language": "eng" }
           ],
           "skos:exactMatch": ["http://purl.obolibrary.org/obo/FAO_0000001"]
         },
         {
-          "@type": "skos:Concept",
+          "@type": "pharmaWien:anatomicalCategory",
           "skos:prefLabel": [
             { "@value": "Anatomical entity, bacteria", "@language": "eng" }
           ],
           "skos:exactMatch": ["http://purl.obolibrary.org/obo/OMIT_0026581"]
         },
         {
-          "@type": "skos:Concept",
+          "@type": "pharmaWien:anatomicalCategory",
           "skos:prefLabel": [
             { "@value": "Viral structures", "@language": "eng" }
           ],
@@ -278,14 +278,14 @@ const state = {
     life: {
       terms: [
         {
-          "@type": "skos:Concept",
+          "@type": "pharmaWien:livingOrg",
           "skos:prefLabel": [
             { "@value": "Living Organisms", "@language": "eng" }
           ],
           "skos:exactMatch": ["http://purl.obolibrary.org/obo/NCBITaxon_1"]
         },
         {
-          "@type": "skos:Concept",
+          "@type": "pharmaWien:livingOrg",
           "skos:prefLabel": [
             { "@value": "Cellosaurus cell-line", "@language": "eng" }
           ],
@@ -297,40 +297,40 @@ const state = {
     biological_macromolecule: {
       terms: [
         {
-          "@type": "skos:Concept",
+          "@type": "pharmaWien:biologicalMacromolecule",
           "skos:prefLabel": [{ "@value": "Protein", "@language": "eng" }],
           "skos:exactMatch": ["http://purl.obolibrary.org/obo/NCIT_C17021"]
         },
         {
-          "@type": "skos:Concept",
+          "@type": "pharmaWien:biologicalMacromolecule",
           "skos:prefLabel": [{ "@value": "Gene", "@language": "eng" }],
           "skos:exactMatch": [
             "http://www.bioassayontology.org/bao#BAO_0000582 "
           ]
         },
         {
-          "@type": "skos:Concept",
+          "@type": "pharmaWien:biologicalMacromolecule",
           "skos:prefLabel": [
             { "@value": "Polynucleotide", "@language": "eng" }
           ],
           "skos:exactMatch": ["http://purl.obolibrary.org/obo/CHEBI_15986"]
         },
         {
-          "@type": "skos:Concept",
+          "@type": "pharmaWien:biologicalMacromolecule",
           "skos:prefLabel": [
             { "@value": "Protein Family", "@language": "eng" }
           ],
           "skos:exactMatch": ["http://purl.obolibrary.org/obo/NCIT_C20130"]
         },
         {
-          "@type": "skos:Concept",
+          "@type": "pharmaWien:biologicalMacromolecule",
           "skos:prefLabel": [
             { "@value": "Protein Subunit", "@language": "eng" }
           ],
           "skos:exactMatch": ["http://www.bioassayontology.org/bao#"]
         },
         {
-          "@type": "skos:Concept",
+          "@type": "pharmaWien:biologicalMacromolecule",
           "skos:prefLabel": [
             { "@value": "Protein Complex", "@language": "eng" }
           ],
@@ -338,14 +338,14 @@ const state = {
         },
 
         {
-          "@type": "skos:Concept",
+          "@type": "pharmaWien:biologicalMacromolecule",
           "skos:prefLabel": [
             { "@value": "Polysaccharide", "@language": "eng" }
           ],
           "skos:exactMatch": ["http://purl.obolibrary.org/obo/CHEBI:18154"]
         },
         {
-          "@type": "skos:Concept",
+          "@type": "pharmaWien:biologicalMacromolecule",
           "skos:prefLabel": [{ "@value": "Lipid", "@language": "eng" }],
           "skos:exactMatch": ["http://purl.obolibrary.org/obo/CHEBI:18059"]
         }
@@ -356,7 +356,7 @@ const state = {
     assay_target: {
       terms: [
         {
-          "@type": "Assay Target: skos:Concept",
+          "@type": "pharmaWien:assayTarget",
           "skos:prefLabel": [
             {
               "@value": "Protein",
@@ -366,7 +366,7 @@ const state = {
           "skos:exactMatch": ["http://purl.obolibrary.org/obo/NCIT_C17021"]
         },
         {
-          "@type": "Assay Target: skos:Concept",
+          "@type": "pharmaWien:assayTarget",
           "skos:prefLabel": [
             {
               "@value": "Gene",
@@ -376,7 +376,7 @@ const state = {
           "skos:exactMatch": ["http://www.bioassayontology.org/bao#BAO_0000582"]
         },
         {
-          "@type": "sAssay Target: kos:Concept",
+          "@type": "pharmaWien:assayTarget",
           "skos:prefLabel": [
             {
               "@value": "Nucleic Acid",
@@ -387,7 +387,7 @@ const state = {
         },
 
         {
-          "@type": "Assay Target: skos:Concept",
+          "@type": "pharmaWien:assayTarget",
           "skos:prefLabel": [
             {
               "@value": "Protein Family",
@@ -397,7 +397,7 @@ const state = {
           "skos:exactMatch": ["http://purl.obolibrary.org/obo/NCIT_C20130"]
         },
         {
-          "@type": "Assay Target: skos:Concept",
+          "@type": "pharmaWien:assayTarget",
           "skos:prefLabel": [
             {
               "@value": "Protein Subunit",
@@ -407,7 +407,7 @@ const state = {
           "skos:exactMatch": ["http://www.bioassayontology.org/bao#BAO_0002555"]
         },
         {
-          "@type": "Assay Target:skos:Concept",
+          "@type": "pharmaWien:assayTarget",
           "skos:prefLabel": [
             {
               "@value": "Protein Complex",
@@ -418,7 +418,7 @@ const state = {
         },
 
         {
-          "@type": "Assay Target: skos:Concept",
+          "@type": "pharmaWien:assayTarget",
           "skos:prefLabel": [
             {
               "@value": "Carbohydrate",
@@ -429,7 +429,7 @@ const state = {
         },
 
         {
-          "@type": "Assay Target: skos:Concept",
+          "@type": "pharmaWien:assayTarget",
           "skos:prefLabel": [
             {
               "@value": "Lipid",
@@ -440,7 +440,7 @@ const state = {
         },
 
         {
-          "@type": "Assay Target: skos:Concept",
+          "@type": "pharmaWien:assayTarget",
           "skos:prefLabel": [
             {
               "@value": "Small Molecule",
@@ -450,7 +450,7 @@ const state = {
           "skos:exactMatch": ["http://purl.obolibrary.org/obo/NCIT_C48809"]
         },
         {
-          "@type": "organism_assay_target",
+          "@type": "pharmaWien:assayTarget",
           "skos:prefLabel": [
             {
               "@value": "Organism",
@@ -460,7 +460,7 @@ const state = {
           "skos:exactMatch": ["http://purl.obolibrary.org/obo/NCIT_C14250"]
         },
         {
-          "@type": "Assay Target: skos:Concept",
+          "@type": "pharmaWien:assayTarget",
           "skos:prefLabel": [
             {
               "@value": "Cultured Cell (cellosaurus)",
@@ -470,7 +470,7 @@ const state = {
           "skos:exactMatch": ["http://purl.obolibrary.org/obo/CL_0000010"]
         },
         {
-          "@type": "Assay Target: skos:Concept",
+          "@type": "pharmaWien:assayTarget",
           "skos:prefLabel": [
             {
               "@value": "Cellular anatomical entity",
@@ -481,7 +481,7 @@ const state = {
         },
 
         {
-          "@type": "Assay Target: skos:Concept",
+          "@type": "pharmaWien:assayTarget",
           "skos:prefLabel": [
             {
               "@value": "Tissue",
diff --git a/src/utils/fields.js b/src/utils/fields.js
index ecb099977bd1040bfcc316a9e9315253b315e5b8..a83a58dcb0ec151e793651caf94643b5ff72e2c5 100644
--- a/src/utils/fields.js
+++ b/src/utils/fields.js
@@ -1060,7 +1060,7 @@ const fields = [
     id: "0-Assay-result",
     predicate: "dcterms:subject",
     type: "skos:Concept",
-    subjectType: "assay_result",
+    //subjectType: "assay_result",
     label: "Uploaded file with assay result",
     value: "",
     component: "assay-selection",
@@ -1076,8 +1076,8 @@ const fields = [
   {
     id: "0-Assay-title",
     predicate: "dcterms:subject",
-    type: "Assay-title",
-    subjectType: "Assaytitle",
+    type: "pharmaWien:assayTitle",
+    //subjectType: "Assaytitle",
     visible: true,
     required: false,
     removable: false,
@@ -1094,8 +1094,8 @@ const fields = [
   {
     id: "0-Assay-protocol",
     predicate: "dcterms:subject",
-    type: "Assay-abstract",
-    subjectType: "AssayAbstract",
+    type: "pharmaWien:assayAbstract",
+    //subjectType: "AssayAbstract",
     visible: true,
     required: false,
     removable: false,
@@ -1113,7 +1113,7 @@ const fields = [
     id: "0-Bioassay-type",
     predicate: "dcterms:subject",
     type: "skos:Concept",
-    subjectType: "Bioassay_type",
+    //subjectType: "Bioassay_type",
     label: "Bioassay type:",
     visible: true,
     required: false,
@@ -1121,7 +1121,7 @@ const fields = [
     component: "selection",
     commit: true,
     visible: true,
-    category: ["assay"],
+    //category: ["assay"],
     vocabulary: "bioassay_type",
     stateVoc: "bioassay_type",
     info: ""
@@ -1129,8 +1129,8 @@ const fields = [
   {
     id: "0-Bioassay-category",
     predicate: "dcterms:subject",
-    type: "skos:Concept",
-    subjectType: "bioassayCategory",
+    type: "pharmaWien:bioassayCategory",
+    //subjectType: "bioassayCategory",
     label: "Bioassay category:",
     value: "",
     visible: true,
@@ -1139,7 +1139,7 @@ const fields = [
     component: "ext-service",
     ontology: "bao",
     ontClass: "BAO_0000015",
-    category: ["assay"],
+    //category: ["assay"],
     topId: "BAO_0000015",
     description: "Bioassay category:",
     info:
@@ -1149,8 +1149,8 @@ const fields = [
   {
     id: "0-Assay-format",
     predicate: "dcterms:subject",
-    type: "skos:Concept",
-    subjectType: "Assayformat",
+    type: "pharmaWien:assayFormat",
+    //subjectType: "Assayformat",
     label: "Assay format",
     visible: true,
     required: false,
@@ -1161,7 +1161,7 @@ const fields = [
     ontClass: "BAO_0000019",
     topId: "BAO_0000019",
     description: "Assay format:",
-    category: ["assay"],
+    //category: ["assay"],
     info:
       "Assay format is a conceptualization of assays based on the biological and / or chemical features of the experimental system. For example assay formats include biochemical assays - referring to assays with purified protein, cell-based - referring to assays in whole cells, or organism-based - referring to assays performed in an organism.",
     infoRef: "http://www.bioassayontology.org/bao#BAO_0000019"
@@ -1169,8 +1169,8 @@ const fields = [
   {
     id: "0-Assay-design-method",
     predicate: "dcterms:subject",
-    type: "skos:Concept",
-    subjectType: "Assay design method",
+    type: "pharmaWien:assayDesignMethod",
+    //subjectType: "Assay design method",
     label: "Assay design method",
     visible: true,
     required: false,
@@ -1180,7 +1180,7 @@ const fields = [
     ontology: "bao",
     // baseurl: "http://www.bioassayontology.org/bao#",
     ontClass: "BAO_0002202",
-    category: ["assay"],
+    //category: ["assay"],
     topId: "BAO_0002202",
     description: "Assay design method:",
     info:
@@ -1191,15 +1191,15 @@ const fields = [
   {
     id: "0-Computational-method",
     predicate: "dcterms:subject",
-    type: "skos:Concept",
-    subjectType: "Computational method",
+    type: "pharmaWien:assayComputationalMethod",
+    //subjectType: "Computational method",
     label: "Computational method",
     visible: true,
     required: false,
     value: "",
     freefield: true,
     component: "ext-service",
-    category: ["assay"],
+    //category: ["assay"],
     ontology: "bao",
     //baseurl: "http://www.bioassayontology.org/bao#",
     ontClass: "BAO_0002094",
@@ -1212,8 +1212,8 @@ const fields = [
   {
     id: "0-Assay-screening-campaign-stage",
     predicate: "dcterms:subject",
-    type: "skos:Concept",
-    subjectType: "Assay screening campaign stage",
+    type: "pharmaWien:assayScreeningCampaignStage",
+    //subjectType: "Assay screening campaign stage",
     label: "Assay screening campaign stage",
     visible: true,
     required: false,
@@ -1223,7 +1223,7 @@ const fields = [
     ontology: "bao",
     ontClass: "BAO_0000029",
     topId: "BAO_0000029",
-    category: ["assay"],
+    //category: ["assay"],
     // baseurl: "http://www.bioassayontology.org/bao#",
     description: "Assay screening campaign stage:",
     info:
@@ -1234,7 +1234,7 @@ const fields = [
     id: "0-Organism",
     predicate: "dcterms:subject",
     type: "skos:Concept",
-    subjectType: "AssayOrganism:",
+    //subjectType: "AssayOrganism:",
     label: "Organism",
     description: "selection",
     value: "",
@@ -1253,8 +1253,8 @@ const fields = [
   {
     id: "0-Cellular-organism",
     predicate: "dcterms:subject",
-    type: "skos:Concept",
-    subjectType: "AssayCellularOrganism",
+    type: "pharmaWien:assayCellularOrganism",
+    //subjectType: "AssayCellularOrganism",
     label: "Cellular organism",
     value: "",
     required: false,
@@ -1270,8 +1270,8 @@ const fields = [
   {
     id: "0-Viruses",
     predicate: "dcterms:subject",
-    type: "skos:Concept",
-    subjectType: "AssayViruses",
+    type: "pharmaWien:assayViruses",
+    //subjectType: "AssayViruses",
     label: "Viruses",
     value: "",
     required: false,
@@ -1287,8 +1287,8 @@ const fields = [
   {
     id: "0-Viroids",
     predicate: "dcterms:subject",
-    type: "skos:Concept",
-    subjectType: "AssayViroids",
+    type: "pharmaWien:assayViroids",
+    //subjectType: "AssayViroids",
     label: "Viroids",
     value: "",
     required: false,
@@ -1304,8 +1304,8 @@ const fields = [
   {
     id: "0-cell-line",
     predicate: "dcterms:subject",
-    type: "skos:Concept",
-    subjectType: "cell line cellosaurus",
+    type: "pharmaWien:assayCellosaurus",
+    //subjectType: "cell line cellosaurus",
     label: "Cultured cell",
     visible: true,
     required: false,
@@ -1323,7 +1323,7 @@ const fields = [
     id: "0-Assay-target",
     predicate: "dcterms:subject",
     type: "skos:Concept",
-    subjectType: "Assay_target",
+    //subjectType: "Assay_target",
     label: "Assay target ",
     description: "selection",
     value: "",
@@ -1343,8 +1343,8 @@ const fields = [
   {
     id: "0-Small-molecule",
     predicate: "dcterms:subject",
-    type: "skos:Concept",
-    subjectType: "assay target small molecule",
+    type: "pharmaWien:smallMol_assayTarget",
+    //subjectType: "assay target small molecule",
     label: "Small molecule name:",
     value: "",
     required: false,
@@ -1361,8 +1361,8 @@ const fields = [
   {
     id: "0-cellular-anatomical-entity",
     predicate: "dcterms:subject",
-    type: "skos:Concept",
-    subjectType: "cellular-anatomical-entity_assayTarget",
+    type: "pharmaWien:cellularAnatomicalEntity",
+    //subjectType: "cellular-anatomical-entity_assayTarget",
     label: "Assay Target Cellular anatomical entity",
     value: "",
     required: false,
@@ -1381,8 +1381,8 @@ const fields = [
   {
     id: "0-tissue",
     predicate: "dcterms:subject",
-    type: "skos:Concept",
-    subjectType: "tissue_assayTarget",
+    type: "pharmaWien:tissue_assayTarget",
+    //subjectType: "tissue_assayTarget",
     label: "Assay Target Tissue name:",
     value: "",
     required: false,
@@ -1402,8 +1402,8 @@ const fields = [
   {
     id: "0-carbohydrate",
     predicate: "dcterms:subject",
-    type: "skos:Concept",
-    subjectType: "assay target carbohydrate",
+    type: "harmaWien:carbohydrate_assayTarget",
+    //subjectType: "assay target carbohydrate",
     label: "Assay Target Carbohydrate:",
     value: "",
     required: false,