diff --git a/src/backend/gs_index/src/components/Corpus.vue b/src/backend/gs_index/src/components/Corpus.vue
index 011abf4..52d86d5 100644
--- a/src/backend/gs_index/src/components/Corpus.vue
+++ b/src/backend/gs_index/src/components/Corpus.vue
@@ -29,6 +29,7 @@
 				sharedState,
 
 				showPre: false,
+				mounted: false,
 			}
 		},
 		computed: {
@@ -229,6 +230,10 @@
 				this.reannotate([p_index], target_tokens);
 			},
 		},
+
+		mounted() {
+			this.mounted = true;
+		}
 	}
 </script>
 
@@ -236,7 +241,7 @@
 	<div class='corpus_wrapper'>
 		<hr>
 		<h4 @click="toggleCorpusVisibility()">{{ header + ": " + corpus_id }}</h4>
-		<div v-if="isCorpusVisible" class="corpus">
+		<div v-if="mounted && isCorpusVisible" class="corpus">
 			<span class="corpus_buttons_span">
 				<button class="corpus_button btn btn-light" @click="download()">Download</button>
 
diff --git a/src/backend/gs_index/src/components/CorpusesView.vue b/src/backend/gs_index/src/components/CorpusesView.vue
index 8aabb74..fa6c12e 100644
--- a/src/backend/gs_index/src/components/CorpusesView.vue
+++ b/src/backend/gs_index/src/components/CorpusesView.vue
@@ -1,6 +1,7 @@
 <script>
 	import { EventBus } from "../EventBus.js";
 	import { GsApi } from "../GsApi.js"
+	import { sharedState } from "../sharedState.js";
 	import sampleCorpuses from "../sampleCorpuses.json"
 	import Corpus from "./Corpus.vue"
 
@@ -52,8 +53,17 @@
 					})*/;
 			},
 			async addLocalCorpus({corpus_id, corpus}) {
+				//corpus_id to be unique and not ""
+				let unique_corpus_id = corpus_id;
+				if (unique_corpus_id == "") unique_corpus_id = "Corpus";
+				
+				const existingIds = new Set(this.localCorpuses.map(c => c.corpus_id));
+				let counter = 1;
+				while (existingIds.has(unique_corpus_id))
+					unique_corpus_id = `${corpus_id} (${counter++})`;
+				
 				this.localCorpuses.push({
-					"corpus_id": corpus_id,
+					"corpus_id": unique_corpus_id,
 					"corpuses_history": [corpus],
 				});
 			},
@@ -68,6 +78,9 @@
 
 			this.getRemoteSamples();
 		},
+		mounted() {
+			sharedState.currentOpenCorpus = "";
+		},
 		beforeDestroy() {
 			EventBus.off("updateCorpuses", this.updateCorpuses); // Clean up the event listener
 			EventBus.off("addLocalCorpus", this.addLocalCorpus); // From UploadView