diff --git a/application/config/navigation.php b/application/config/navigation.php
index d7ec0c046..827aaa154 100644
--- a/application/config/navigation.php
+++ b/application/config/navigation.php
@@ -30,7 +30,7 @@ $config['navigation_header'] = array(
 					'icon' => 'list-ol',
 					'description' => 'Reihungstests',
 					'expand' => true,
-					'sort' => 1,
+					'sort' => 10,
 					'requiredPermissions' => 'infocenter:r'
 				)
 			)
diff --git a/application/views/organisation/reihungstest/ReihungstestUebersichtData.php b/application/views/organisation/reihungstest/ReihungstestUebersichtData.php
index ce16e4726..2eb22c765 100644
--- a/application/views/organisation/reihungstest/ReihungstestUebersichtData.php
+++ b/application/views/organisation/reihungstest/ReihungstestUebersichtData.php
@@ -1,4 +1,8 @@
 <?php
+	$schwund = 0;
+	if(defined('REIHUNGSTEST_ARBEITSPLAETZE_SCHWUND') && !is_null(REIHUNGSTEST_ARBEITSPLAETZE_SCHWUND))
+		$schwund = REIHUNGSTEST_ARBEITSPLAETZE_SCHWUND;
+	
 	$filterWidgetArray = array(
 		'query' => "
 		SELECT
@@ -23,7 +27,7 @@
 				/* Plaetze aus Termin oder zugeteilten Raeumen minus Schwund */
 				COALESCE(
 					max_teilnehmer,
-					(SELECT sum(arbeitsplaetze) - ceil(sum(arbeitsplaetze)/100.0*5)
+					(SELECT sum(arbeitsplaetze) - ceil(sum(arbeitsplaetze)/100.0*".$schwund.")
 					FROM
 						public.tbl_rt_ort
 						JOIN public.tbl_ort ON(tbl_rt_ort.ort_kurzbz=tbl_ort.ort_kurzbz)
@@ -100,6 +104,10 @@
 				public.tbl_reihungstest
 			WHERE
 				datum>now()-'2 weeks'::interval
+				AND NOT EXISTS(
+					SELECT 1 FROM public.tbl_studiengang
+					WHERE studiengang_kz=tbl_reihungstest.studiengang_kz AND tbl_studiengang.typ='m'
+				)
 			ORDER BY datum desc
 		) data
 		",
@@ -156,6 +164,15 @@
 				$datasetRaw->{'oeffentlich'} = 'Nein';
 			}
 
+			if ($datasetRaw->{'datum'} == null)
+			{
+				$datasetRaw->{'datum'} = 'Not sent';
+			}
+			else
+			{
+				$datasetRaw->{'datum'} = date_format(date_create($datasetRaw->{'datum'}), 'd.m.Y');
+			}
+
 			return $datasetRaw;
 		}
 	);
diff --git a/content/kontakt.xul.php b/content/kontakt.xul.php
index c5ad899df..d9bb44e71 100644
--- a/content/kontakt.xul.php
+++ b/content/kontakt.xul.php
@@ -87,7 +87,7 @@ $uid = get_uid();
 						class="sortDirectionIndicator"
 						sort="rdf:http://www.technikum-wien.at/adresse/rdf#gemeinde" onclick="KontaktAdresseTreeSort()"/>
 					<splitter class="tree-splitter"/>
-					<treecol id="kontakt-adressen-treecol-nation" label="Nation" flex="1" hidden="true"
+					<treecol id="kontakt-adressen-treecol-nation" label="Nation" flex="1" hidden="false"
 						class="sortDirectionIndicator"
 						sort="rdf:http://www.technikum-wien.at/adresse/rdf#nation" onclick="KontaktAdresseTreeSort()"/>
 					<splitter class="tree-splitter"/>
diff --git a/public/js/FilterWidget.js b/public/js/FilterWidget.js
index a727a9a19..18082b96d 100644
--- a/public/js/FilterWidget.js
+++ b/public/js/FilterWidget.js
@@ -846,6 +846,7 @@ var FHC_FilterWidget = {
 			&& $("#filterTableDataset").hasClass("table-condensed"))
 		{
 			$("#filterTableDataset").tablesorter({
+				dateFormat: "ddmmyyyy",
 				widgets: ["zebra", "filter"],
 				widgetOptions: {
 					filter_saveFilters : true