diff --git a/src/include/constants_logstream.php b/src/include/constants_logstream.php
index 1232c69..d720bc5 100644
--- a/src/include/constants_logstream.php
+++ b/src/include/constants_logstream.php
@@ -136,19 +136,19 @@ $fields[SYSLOG_MESSAGE]['FieldAlign'] = "left";
 // --- 
 
 // --- Define default Database field mappings!
-$dbmapping['winsyslog'][SYSLOG_UID] = "ID";
-$dbmapping['winsyslog'][SYSLOG_DATE] = "DeviceReportedTime";
-$dbmapping['winsyslog'][SYSLOG_HOST] = "FromHost";
-$dbmapping['winsyslog'][SYSLOG_MESSAGETYPE] = "InfoUnitID";
-$dbmapping['winsyslog'][SYSLOG_MESSAGE] = "Message";
-$dbmapping['winsyslog'][SYSLOG_FACILITY] = "Facility";
-$dbmapping['winsyslog'][SYSLOG_SEVERITY] = "Priority";
-$dbmapping['winsyslog'][SYSLOG_SYSLOGTAG] = "SysLogTag";
-$dbmapping['winsyslog'][SYSLOG_EVENT_ID] = "EventID";
-$dbmapping['winsyslog'][SYSLOG_EVENT_LOGTYPE] = "EventLogType";
-$dbmapping['winsyslog'][SYSLOG_EVENT_SOURCE] = "EventSource";
-$dbmapping['winsyslog'][SYSLOG_EVENT_CATEGORY] = "EventCategory";
-$dbmapping['winsyslog'][SYSLOG_EVENT_USER] = "EventUser";
+$dbmapping['monitorware'][SYSLOG_UID] = "ID";
+$dbmapping['monitorware'][SYSLOG_DATE] = "DeviceReportedTime";
+$dbmapping['monitorware'][SYSLOG_HOST] = "FromHost";
+$dbmapping['monitorware'][SYSLOG_MESSAGETYPE] = "InfoUnitID";
+$dbmapping['monitorware'][SYSLOG_MESSAGE] = "Message";
+$dbmapping['monitorware'][SYSLOG_FACILITY] = "Facility";
+$dbmapping['monitorware'][SYSLOG_SEVERITY] = "Priority";
+$dbmapping['monitorware'][SYSLOG_SYSLOGTAG] = "SysLogTag";
+$dbmapping['monitorware'][SYSLOG_EVENT_ID] = "EventID";
+$dbmapping['monitorware'][SYSLOG_EVENT_LOGTYPE] = "EventLogType";
+$dbmapping['monitorware'][SYSLOG_EVENT_SOURCE] = "EventSource";
+$dbmapping['monitorware'][SYSLOG_EVENT_CATEGORY] = "EventCategory";
+$dbmapping['monitorware'][SYSLOG_EVENT_USER] = "EventUser";
 
 $dbmapping['syslogng'][SYSLOG_UID] = "seq";
 $dbmapping['syslogng'][SYSLOG_DATE] = "datetime";
diff --git a/src/include/functions_config.php b/src/include/functions_config.php
index faaeed2..639aed9 100644
--- a/src/include/functions_config.php
+++ b/src/include/functions_config.php
@@ -86,9 +86,14 @@
 						$content['Sources'][$iSourceID]['ObjRef']->DBServer = $mysource['DBServer'];
 						$content['Sources'][$iSourceID]['ObjRef']->DBName = $mysource['DBName'];
 						$content['Sources'][$iSourceID]['ObjRef']->DBType = $mysource['DBType'];
-						$content['Sources'][$iSourceID]['ObjRef']->DBTableType = $mysource['DBTableType'];
 						$content['Sources'][$iSourceID]['ObjRef']->DBTableName = $mysource['DBTableName'];
 						
+						// Legacy handling for tabletype!
+						if ( isset($mysource['DBTableType']) && strtolower($mysource['DBTableType']) == "winsyslog" )
+							$content['Sources'][$iSourceID]['ObjRef']->DBTableType = "monitorware"; // Convert to MonitorWare!
+						else
+							$content['Sources'][$iSourceID]['ObjRef']->DBTableType = strtolower($mysource['DBTableType']);
+
 						// Optional parameters!
 						if ( isset($mysource['DBPort']) ) { $content['Sources'][$iSourceID]['ObjRef']->DBPort = $mysource['DBPort']; }
 						if ( isset($mysource['DBUser']) ) { $content['Sources'][$iSourceID]['ObjRef']->DBUser = $mysource['DBUser']; }
diff --git a/src/include/functions_filters.php b/src/include/functions_filters.php
index 187e571..ba439ec 100644
--- a/src/include/functions_filters.php
+++ b/src/include/functions_filters.php
@@ -207,7 +207,7 @@ function GetFacilityDisplayName( $nFacilityID )
 	}
 
 	// Default 
-	return "Unknown Facility";
+	return "Unknown Facility($nFacilityID)";
 }
 
 function GetSeverityDisplayName( $nSeverityID )
@@ -221,7 +221,7 @@ function GetSeverityDisplayName( $nSeverityID )
 	}
 
 	// Default 
-	return "Unknown Severity";
+	return "Unknown Severity($nSeverityID)";
 }
 
 function GetMessageTypeDisplayName( $nMsgTypeID )
@@ -235,7 +235,7 @@ function GetMessageTypeDisplayName( $nMsgTypeID )
 	}
 
 	// Default 
-	return "Unknown";
+	return "Unknown MessageType($nMsgTypeID)";
 }
 
 
@@ -249,9 +249,8 @@ function GetTimeStampFromTimeString($szTimeString)
 	}
 	else
 	{
-		//WTF?
-		die ("WTF GetTimeStampFromTimeString " . $szTimeString);
-		return 0;
+		OutputDebugMessage("Unparseable Time in GetTimeStampFromTimeString - '" . $szTimeString . "'");
+		return $szTimeString;
 	}
 }