diff --git a/src/App.vue b/src/App.vue
index ed37f71..ecf21ea 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,9 +1,4 @@
 <template>
-    <div class="container-fluid">
-        <div class="development-notice">
-            DEVELOPMENT SITE <br> >> Only for development purposes <<
-        </div>
-    </div>
     <!-- <HelloWorld msg="Welcome to Your Vue.js plus TypeScript App" /> -->
     <nav class="navbar navbar-light border-bottom" role="navigation" aria-label="main navigation">
         <div class="navbar-brand">
diff --git a/src/views/dataset-detail.component/dataset-detail.component.ts b/src/views/dataset-detail.component/dataset-detail.component.ts
index 04a7995..a2dc7b6 100644
--- a/src/views/dataset-detail.component/dataset-detail.component.ts
+++ b/src/views/dataset-detail.component/dataset-detail.component.ts
@@ -233,5 +233,17 @@ export default class DatasetDetailComponent extends Vue {
         return citation;
     }
 
+    accessNotFromDoi(): boolean {        
+        const host = window.location.host;
+        const parts = host.split(".");
+        if (parts[0] === "doi") {
+            console.log("From DOI");
+            // If in DOI subdomain, open external search in a new window
+            return false;
+        } else {
+            console.log("Not From DOI");
+            return true;
+        }
+    }
     
 }
diff --git a/src/views/dataset-detail.component/dataset-detail.component.vue b/src/views/dataset-detail.component/dataset-detail.component.vue
index 3547fdc..ac55a61 100644
--- a/src/views/dataset-detail.component/dataset-detail.component.vue
+++ b/src/views/dataset-detail.component/dataset-detail.component.vue
@@ -183,15 +183,21 @@
                             <h3 class="label uppercase">Schlüsselwörter/Keywords</h3>
                             <p v-if="dataset.hasOwnProperty('subjects')">
                                 <!-- Iterate through subjects and display them as router links -->
-                                <span v-for="(subject, index) in dataset.subjects" :key="subject.value">
-                                    <router-link
-                                        :to="{ name: 'Search', params: { display: subject.value, type: 'subjects' } }"
-                                        class="link-label"
-                                    >
-                                        {{ subject.value }}
-                                    </router-link>
-                                    <!-- Add a comma and space after each keyword except the last one -->
-                                    <span v-if="index < dataset.subjects.length - 1">, </span>
+                                <span v-if="accessNotFromDoi()">
+                                    <span v-for="(subject, index) in dataset.subjects" :key="subject.value">
+                                        <router-link
+                                            :to="{ name: 'Search', params: { display: subject.value, type: 'subjects' } }"
+                                            class="link-label"
+                                        >
+                                            {{ subject.value }}
+                                        </router-link>
+                                        <!-- Add a comma and space after each keyword except the last one -->
+                                        <span v-if="index < dataset.subjects.length - 1">, </span>
+                                    </span>
+                                </span>
+
+                                <span v-else>
+                                    {{ dataset.subjects.map((u) => u.value).join(", ") }}
                                 </span>
                             </p>
                             <p v-else>-</p>