diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 22e3da1d7..8f9a43796 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -898,7 +898,7 @@ class Students extends FHCAPI_Controller
 					n.start,
 					n.ende
 				  FROM public.tbl_notizzuordnung AS nz
-					JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
+					JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id AND nz.prestudent_id IS NOT NULL
 					JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz "
 				. $whereTags .
 				"
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 51c6faf5b..7e97e26c1 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -422,6 +422,16 @@ export default {
 
 			if(selected.length > 0 || deselected.length > 0){
 				this.lastSelected = this.selected;
+
+				//for tags
+				this.selectedRows = this.$refs.table.tabulator.getSelectedRows();
+				this.selectedColumnValues = this.selectedRows.filter(
+					row => row.getData().prestudent_id !== undefined
+						&& row.getData().prestudent_id
+				).map(
+					row => row.getData().prestudent_id
+				);
+
 				this.$emit('update:selected', data);
 			}
 		},