diff --git a/www/index.php b/www/index.php
index b962b07..792ba95 100644
--- a/www/index.php
+++ b/www/index.php
@@ -38,8 +38,8 @@ $db_link = mysqli_connect ($dbhost, $dbuser, $dbpassword, $database);
 				  echo "<td>". $time . "</td>";
 				  echo "<td>". parse("service",$fms_id) . "</td>";
 				  echo "<td>". parse("country",$fms_id) . "</td>";
-				  echo "<td>". $data['location'] . "</td>";
-				  echo "<td>". $data['vehicle'] . "</td>";
+				  echo "<td>". parse("location",$fms_id) . "</td>";
+				  echo "<td>". parse("vehicle",$fms_id) . "</td>";
 				  echo "<td>". $data['status'] . "</td>";
 				  echo "<td>". parse("direction",$fms_id) . "</td>";
 				  echo "<td>". $data['tsi'] . "</td>";
@@ -65,7 +65,7 @@ $db_link = mysqli_connect ($dbhost, $dbuser, $dbpassword, $database);
 			echo "<tr>";
 				  echo "<td>". $data['id'] . "</td>";
 				  echo "<td>". $time . "</td>";
-				  echo "<td>". $data['zvei'] . "</td>";
+				  echo "<td>". parse('zvei',$data['zvei']) . "</td>";
 			  echo "</tr>";
 			}
 			echo "</table>";
diff --git a/www/parser.php b/www/parser.php
index e1242ad..5a8bb00 100644
--- a/www/parser.php
+++ b/www/parser.php
@@ -1,8 +1,7 @@
 <?php
 //Data from TRBOS-FMS http://www.lfs-bw.de/Fachthemen/Digitalfunk-Funk/Documents/Pruefstelle/TRBOS-FMS.pdf
 
-
-	function parse($mode, $fms)
+	function parse($mode, $data)
 	{	
 		//Data for Service Parsing
 		$service = array(
@@ -24,7 +23,7 @@
 		"f" => "Fernwirktelegramm",
 	);
 
-		//Data for Country Parsing
+	//Data for Country Parsing
 	$country = array(
 		"0" => "Sachsen",
 		"1" => "Bund",
@@ -43,21 +42,89 @@
 		"e" => "Meck-Pom/Sachsen-Anhalt",
 		"f" => "Brandenburg/Thüringen",
 	);
+	
+	//Data for Location Parsing
+	$location = array(
+		"11" => "testLoc",
+		"22" => "testLoc",
+		"33" => "testLoc"
+	);
+	
+	//Data for Vehicle Parsing
+	$vehicle = array(
+		"1111" => "testVeh",
+		"2222" => "testVeh",
+		"3333" => "testVeh"
+	);
+	
+	
+	//Data for ZVEI Parsing
+	$country = array(
+		"12345" => "testZvei",
+		"23456" => "testZvei",
+		"34567" => "testZvei",
+	);
 
+	
 		switch ($mode) {
+			#Parse Service
 			case "service":
-				return $service[substr($fms,0,1)];
+				if (array_key_exists($data, $service)) {
+					return $service[substr($data,0,1)];
+				}else
+				{
+					return $data;
+				}
 				break;
-				
+			
+			#Parse Country
 			case "country":
-				return $country[substr($fms,1,1)];
+				if (array_key_exists($data, $country)) {
+					return $country[substr($data,1,1)];
+				}else
+				{
+					return $data;
+				}
 				break;
 				
+			#Parse Location
+			case "location":
+				if (array_key_exists($data, $location)) {
+					return $location[substr($data,2,2)];
+				}else
+				{
+					return $data;
+				}
+				break;
+				
+			#Parse Vehicle
+			case "vehicle":
+				if (array_key_exists($data, $vehicle)) {
+					return $vehicle[substr($data,4,4)];
+				}else
+				{
+					return $data;
+				}
+				break;
+			
+			#Parse direction
 			case "direction":
 				if(substr($fms,9,1) == 1){
 					return "L->F";
 				}elseif(substr($fms,9,1) == 0){
 					return "F->L";
+				}else
+					return "ERR!";
+				}
+				break;
+	
+			#Parse Zvei
+			case "zvei":
+				if (array_key_exists($data, $zvei)) {
+					return $data ." - ". $zvei[$data];
+				}else
+				{
+					return $data;
 				}
 				break;