diff --git a/application/libraries/tags/CoreMissingZgvTagLib.php b/application/libraries/tags/CoreMissingZgvTagLib.php
index e25aed4cc..2d5df0ffc 100644
--- a/application/libraries/tags/CoreMissingZgvTagLib.php
+++ b/application/libraries/tags/CoreMissingZgvTagLib.php
@@ -28,10 +28,21 @@ class CoreMissingZgvTagLib
 		$this->ci->PrestudentModel->addJoin('public.tbl_prestudentstatus', 'prestudent_id');
 		$this->ci->PrestudentModel->addJoin('public.tbl_benutzer bn', 'person_id');
 		$this->ci->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
+
+		$this->ci->PrestudentModel->db->group_start();
+
+		$this->ci->PrestudentModel->db->where('zgvdatum', null);
+		$this->ci->PrestudentModel->db->where('typ', 'b');
+
+		$this->ci->PrestudentModel->db->or_group_start();
+		$this->ci->PrestudentModel->db->where('zgvmadatum', null);
+		$this->ci->PrestudentModel->db->where('typ', 'm');
+		$this->ci->PrestudentModel->db->group_end();
+
+		$this->ci->PrestudentModel->db->group_end();
+
 		$result = $this->ci->PrestudentModel-> loadWhere(array(
-			'bn.aktiv' => true, //check if necessary
-			'zgvdatum' => null,
-			'typ' => 'b',
+			'bn.aktiv' => true,
 			'studiensemester_kurzbz' => $semester
 		));
 
@@ -60,16 +71,36 @@ class CoreMissingZgvTagLib
 		$semester = $params['studiensemester_kurzbz'];
 		$prestudent_id = $params['id'];
 
+		$this->ci->PrestudentModel->addSelect('prestudent_id');
+		$this->ci->PrestudentModel->addSelect('start as von');
+		$this->ci->PrestudentModel->addSelect('ende as bis');
 		$this->ci->PrestudentModel->addJoin('public.tbl_prestudentstatus', 'prestudent_id');
+
+		//add studiensemester also here for manual rebuild
+		$this->ci->PrestudentModel->addJoin('public.tbl_studiensemester', 'studiensemester_kurzbz');
+
 		$this->ci->PrestudentModel->addJoin('public.tbl_benutzer bn', 'person_id');
 		$this->ci->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
-		$result = $this->ci->PrestudentModel->loadWhere(array(
-			'bn.aktiv' => true, //check if necessary
-			'zgvdatum' => null,
-			'typ' => 'b',
+
+		$this->ci->PrestudentModel->db->group_start();
+
+		$this->ci->PrestudentModel->db->where('zgvdatum', null);
+		$this->ci->PrestudentModel->db->where('typ', 'b');
+
+		$this->ci->PrestudentModel->db->or_group_start();
+		$this->ci->PrestudentModel->db->where('zgvmadatum', null);
+		$this->ci->PrestudentModel->db->where('typ', 'm');
+		$this->ci->PrestudentModel->db->group_end();
+
+		$this->ci->PrestudentModel->db->group_end();
+		$this->ci->PrestudentModel->db->limit(1);
+
+		$result = $this->ci->PrestudentModel-> loadWhere(array(
+			'bn.aktiv' => true,
 			'studiensemester_kurzbz' => $semester,
 			'prestudent_id' => $prestudent_id
 		));
+
 		if(hasData($result))
 		{
 			return $result;
diff --git a/public/css/components/Detailheader.css b/public/css/components/Detailheader.css
index dcfcf6806..e9ebddfc1 100644
--- a/public/css/components/Detailheader.css
+++ b/public/css/components/Detailheader.css
@@ -62,3 +62,16 @@
     top:13%;"
     z-index: 104; font-size: 1rem; width: 2.5rem; height: 2.5rem; opacity:0; transition: opacity 0.2s; top:13%;"
 }*/
+
+.tag-hover:hover {
+    background-color: #e9ecef;
+}
+
+.green {
+    background-color: #e9ecef;
+}
+
+.btn-hover {
+    --bs-btn-hover-bg: #e9ecef; /* Neue Hintergrundfarbe beim Hover */
+    --bs-btn-hover-border-color: #e9ecef; /* Neue Rahmenfarbe beim Hover */
+}
diff --git a/public/css/tags.css b/public/css/tags.css
index 0634c5ce3..0230cfbda 100644
--- a/public/css/tags.css
+++ b/public/css/tags.css
@@ -145,3 +145,8 @@
 	float: right;
 	margin-top: 3px;
 }
+
+.btn-hover {
+	--bs-btn-hover-bg:  #e9ecef;
+	--bs-btn-hover-border-color: #e9ecef;
+}
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 5bf49731b..f57b679db 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -400,32 +400,37 @@ export default {
 
 				<div v-if="headerData.length == 1">
 					<div v-if="!isLoading" class="d-flex align-items-center gap-3">
-						<h2 class="h4">
+						<h2 class="h4 mt-2">
 							{{headerData[0].titelpre}}
 							{{headerData[0].vorname}}
 							{{headerData[0].nachname}}
 							<span v-if="headerData[0].titelpost">, </span>
 							{{headerData[0].titelpost}}
 						</h2>
-						<core-tag ref="tagComponent"
-							v-if="tagsEnabled"
-							:endpoint="tagEndpoint"
-							:values="prestudentIds"
-							@added="addedTag"
-							@deleted="deletedTag"
-							@updated="updatedTag"
-							zuordnung_typ="prestudent_id"
-						></core-tag>
-						<div
-							role="button"
-							v-if="tagsEnabled"
-							@click="rebuildPrestudentTags"
-							class="btn btn-outline btn-light mb-1"
-							:title="'Automatische Tags fuer ' + currentSemester + ' neu laden'"
-							>
-							<i class="fa-solid fa-refresh pe-1"></i>
-							<span>{{currentSemester}}</span>
+
+						<div class="d-flex border rounded align-items-center ps-1">
+							<core-tag ref="tagComponent"
+								v-if="tagsEnabled"
+								:endpoint="tagEndpoint"
+								:values="prestudentIds"
+								:show-hover="true"
+								@added="addedTag"
+								@deleted="deletedTag"
+								@updated="updatedTag"
+								zuordnung_typ="prestudent_id"
+							></core-tag>
+							<div
+								role="button"
+								v-if="tagsEnabled"
+								@click="rebuildPrestudentTags"
+								class="btn btn-outline btn-sm btn-hover m-1"
+								:title="$p.t('tag','rebuild_tags') +  ' ' + currentSemester"
+								>
+								<i class="fa-solid fa-refresh pe-1"></i>
+								<span>{{currentSemester}}</span>
+							</div>
 						</div>
+
 						<h6  v-if="headerData[0].unruly" class="badge" :class="'bg-unruly rounded-0'"><strong>unruly</strong></h6>
 					</div>
 					<div v-else class="d-flex align-items-center gap-3">
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index b5973dbb0..e4132c2a2 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -317,6 +317,7 @@ export default {
     "$p.user_language.value"(n, o) {
       if (n !== o && o !== undefined && this.$refs.table.tableBuilt) {
         this.translateTabulator();
+        this.$reloadList();
       }
     },
     "tagFilterState.selectedOptions": {
@@ -842,35 +843,39 @@ export default {
         </div>
        </template>
 
-      <template #actions>
-        <core-tag ref="tagComponent"
-          v-if="tagsEnabled"
-          :endpoint="tagEndpoint"
-          :values="selectedColumnValues"
-          @added="addedTag"
-          @deleted="deletedTag"
-          @updated="updatedTag"
-          zuordnung_typ="prestudent_id"
-        ></core-tag>
+      <template #tags>
+        <div class="d-flex border rounded align-items-center ps-1">
+          <core-tag ref="tagComponent"
+            v-if="tagsEnabled"
+            :endpoint="tagEndpoint"
+            :values="selectedColumnValues"
+            @added="addedTag"
+            @deleted="deletedTag"
+            @updated="updatedTag"
+            zuordnung_typ="prestudent_id"
+            show-hover
+          ></core-tag>
 
-		<button
-			v-if="!selected.length"
-			class="btn btn-outline btn-light mb-1"
-			@click="rebuild(selected)"
-			:title="$p.t('tag','rebuild_tags') + ' Stg ' + currentSemester"
-			>
-				<i class="fa-solid fa-refresh pe-1"></i> STG
-		</button>
-		<button
-			v-else
-			class="btn btn-outline btn-light mb-1"
-			@click="rebuild(selected)"
-			:title="$p.t('tag','rebuild_tags') + ' ' + $p.t('ui','selection') + ' ' + currentSemester"
-			>
-				<i class="fa-solid fa-refresh pe-1"></i> {{selected.length}}
-		</button>
+          <button
+              v-if="!selected.length"
+              class="btn btn-outline btn-sm m-1 btn-hover"
+              @click="rebuild(selected)"
+              :title="$p.t('tag','rebuild_tags') + ' Stg ' + currentSemester"
+              >
+                  <i class="fa-solid fa-refresh pe-1"></i> STG
+          </button>
+          <button
+              v-else
+              class="btn btn-outline btn-sm m-1 btn-hover"
+              @click="rebuild(selected)"
+              :title="$p.t('tag','rebuild_tags') + ' ' + $p.t('ui','selection') + ' ' + currentSemester"
+              >
+                  <i class="fa-solid fa-refresh pe-1"></i> {{selected.length}}
+          </button>
+        </div>
+      </template>
 
-        <template v-if="filter.length || headerFilterActive">
+      <template v-if="filter.length || headerFilterActive">
         <div class="d-flex justify-content-center align-items-center gap-2 ps-4 position-absolute start-50 translate-middle-x">
           <p class="text-danger mb-0">
             <strong>{{$p.t('filter','filterActive')}}</strong>
@@ -884,8 +889,6 @@ export default {
             <span class="fa-solid fa-filter-circle-xmark"></span>
           </button>
         </div>
-        </template>
-
       </template>
 
       <template #filter>
@@ -895,6 +898,7 @@ export default {
           </div>
         </div>
       </template>
+
       </core-filter-cmpt>
     </div>
     <list-new ref="new" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz"></list-new>
diff --git a/public/js/components/Tag/Tag.js b/public/js/components/Tag/Tag.js
index faef12f15..fc20213c9 100644
--- a/public/js/components/Tag/Tag.js
+++ b/public/js/components/Tag/Tag.js
@@ -28,6 +28,10 @@ export default {
 		confirmLimit: {
 			type: Number,
 			default: 20
+		},
+		showHover: {
+			type: Boolean,
+			default: false
 		}
 	},
 	data() {
@@ -228,7 +232,8 @@ export default {
 			<span :title="values.length === 0 ? 'Bitte Zeilen markieren' : ''">
 			<button @mouseover="showList = true" 
 					:disabled="!values || values.length === 0"
-					class="btn btn-sm">
+					class="btn btn-sm"
+					:class="{'btn-hover': showHover}">
 				<i class="fa-solid fa-tag fa-xl"></i>
 			</button>
 			</span>
diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 31b1efe12..70b11401e 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -1094,7 +1094,7 @@ export const CoreFilterCmpt = {
 		<div :id="'filterCollapsables' + idExtra">
 
 			<div class="d-flex flex-row justify-content-between flex-wrap">
-				<div v-if="newBtnShow || reload || $slots.search || $slots.actions" class="d-flex gap-2 align-items-baseline flex-wrap">
+				<div v-if="newBtnShow || reload || $slots.search || $slots.actions || $slots.tags" class="d-flex gap-2 align-items-baseline flex-wrap">
 					<button v-if="newBtnShow" class="btn btn-primary" :class="newBtnClass" :title="newBtnLabel ? undefined : 'New'" :aria-label="newBtnLabel ? undefined : 'New'" @click="$emit('click:new', $event)" :disabled="newBtnDisabled">
 						<span class="fa-solid fa-plus" aria-hidden="true"></span>
 						{{ newBtnLabel }}
@@ -1107,6 +1107,7 @@ export const CoreFilterCmpt = {
 						<span v-else id="selected-info-text"> Mit {{ selectedData.length }} ausgewählten:</span>
 					</span>
 					<slot name="actions" v-bind="{selected: tabulatorHasSelector ? selectedData : []}"></slot>
+					<slot name="tags"></slot>
 					<slot name="search"></slot>
 				</div>
 				<div class="d-flex gap-1 align-items-baseline flex-grow-1 justify-content-end">