diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index f6b54098b..2498b9246 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -1353,7 +1353,9 @@ class Lehrveranstaltung_model extends DB_Model
 				tbl_lehrveranstaltung.semester as lv_semester,
 				tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung,
 				(SELECT kurzbz FROM public.tbl_mitarbeiter
-				 WHERE mitarbeiter_uid=tbl_lehreinheitmitarbeiter.mitarbeiter_uid) as lektor
+				 WHERE mitarbeiter_uid=tbl_lehreinheitmitarbeiter.mitarbeiter_uid) as lektor,
+				 lehre.tbl_lehrveranstaltung.orgform_kurzbz as orgform
+			
 			FROM
 				lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
 									  JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 4fb7945e7..78a279104 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -77,7 +77,7 @@ const router = VueRouter.createRouter({
 			props: true
 		},
 		{
-			path: `/Cis/Benotungstool/:lv_id/:sem_kurzbz`,
+			path: `/Cis/Benotungstool/:lv_id?/:sem_kurzbz?`,
 			name: 'Benotungstool',
 			component: Benotungstool,
 			props: true
diff --git a/public/js/components/DropdownModes/LehreinheitenModule.js b/public/js/components/DropdownModes/LehreinheitenModule.js
index 8bea0ac77..f421929e6 100644
--- a/public/js/components/DropdownModes/LehreinheitenModule.js
+++ b/public/js/components/DropdownModes/LehreinheitenModule.js
@@ -22,6 +22,11 @@ export function bindParams(paramsRef) {
 }
 
 async function fetchLehreinheiten(lv_id, sem_kurzbz) {
+	if (!lv_id || !sem_kurzbz) {
+		options.value = []
+		return
+	}
+	
 	appContext.$api.call(ApiLehre.getLeForLv(lv_id, sem_kurzbz)).then(res => {
 
 		const data =  []
diff --git a/public/js/tabulator/formatter/centered.js b/public/js/tabulator/formatter/centered.js
index 3c38f4d4d..a3e7ebc46 100644
--- a/public/js/tabulator/formatter/centered.js
+++ b/public/js/tabulator/formatter/centered.js
@@ -1,5 +1,23 @@
-export function centeredFormatter (cell) 
-{
-	const val = cell.getValue()
-	return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">'+val+'</div>'
+export function centeredTextFormatter(cell) {
+	const longForm = cell.getValue()
+	if(!longForm) return
+	const data = cell.getData()
+	const entry = Object.entries(data).find(entry => entry[1] == longForm)
+
+	// shortFormKey must have same keyname as longForm but with 'Short' appended 
+	const shortForm = data[entry[0]+'Short']
+
+	if(shortForm && longForm) {
+		return `<div style="display: flex; justify-content: start; align-items: center; height: 100%; width: 100%;">
+				<span class="full-text" style="max-width: 100%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; margin: 0px;">
+					${longForm}
+				</span>
+				<span class="short-text" style="font-weight: bold; display: none;">
+					${shortForm}
+				</span>
+				</div>`;
+	} else {
+		return '<div style="display: flex; justify-content: start; align-items: center; height: 100%">' +
+			'<p style="max-width: 100%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; margin: 0px;">'+longForm+'</p></div>'
+	}
 }
\ No newline at end of file