diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
index 638e279df..9b2643a94 100644
--- a/application/views/system/infocenter/infocenterData.php
+++ b/application/views/system/infocenter/infocenterData.php
@@ -145,6 +145,11 @@
 				$datasetRaw->{'LockDate'} = 'Not locked';
 			}
 
+			if ($datasetRaw->{'StgAbgeschickt'} == null)
+			{
+				$datasetRaw->{'StgAbgeschickt'} = 'N/A';
+			}
+
 			return $datasetRaw;
 		},
 		'markRow' => function($datasetRaw) {
diff --git a/application/views/widgets/filter/selectFields.php b/application/views/widgets/filter/selectFields.php
index 929b87805..6ce678fb8 100644
--- a/application/views/widgets/filter/selectFields.php
+++ b/application/views/widgets/filter/selectFields.php
@@ -151,7 +151,12 @@
 				for (var i = 0; i < data.allSelectedFields.length; i++)
 				{
 					var fieldName = data.allSelectedFields[i];
-					var fieldToDisplay = data.allColumnsAliases[i];
+					var fieldToDisplay = data.allSelectedFields[i];
+
+					if (data.allColumnsAliases != null && $.isArray(data.allColumnsAliases))
+					{
+						fieldToDisplay = data.allColumnsAliases[i];
+					}
 
 					strDropDown = '<option value="' + fieldName + '">' + fieldToDisplay + '</option>';
 					$("#addField").append(strDropDown);
diff --git a/application/views/widgets/filter/selectFilters.php b/application/views/widgets/filter/selectFilters.php
index 104687522..54f7f90fd 100644
--- a/application/views/widgets/filter/selectFilters.php
+++ b/application/views/widgets/filter/selectFilters.php
@@ -219,7 +219,12 @@
 				for (var i = 0; i < data.allSelectedFields.length; i++)
 				{
 					var fieldName = data.allSelectedFields[i];
-					var fieldToDisplay = data.allColumnsAliases[i];
+					var fieldToDisplay = data.allSelectedFields[i];
+
+					if (data.allColumnsAliases != null && $.isArray(data.allColumnsAliases))
+					{
+						fieldToDisplay = data.allColumnsAliases[i];
+					}
 
 					strDropDown = '<option value="' + fieldName + '">' + fieldToDisplay + '</option>';
 					$("#addFilter").append(strDropDown);
diff --git a/application/widgets/FilterWidget.php b/application/widgets/FilterWidget.php
index 776681455..925126a43 100644
--- a/application/widgets/FilterWidget.php
+++ b/application/widgets/FilterWidget.php
@@ -884,7 +884,7 @@ class FilterWidget extends Widget
 			$selectedFields = $filterSessionArray[self::SELECTED_FIELDS];
 		}
 
-		if (isset($this->listFields) && count($selectedFields) > 0)
+		if (isset($this->listFields) && count($selectedFields) > 0 && is_array($this->columnsAliases) && count($this->columnsAliases) > 0)
 		{
 			$columnsAliases = array();