diff --git a/index.php b/index.php
index 57dbeb2..25b6536 100644
--- a/index.php
+++ b/index.php
@@ -77,14 +77,14 @@ if ($type == "validate") {
 
   foreach ($api->get($from, $to, $count, $date, $time, $mode) as $conn) {
    print(" <connection id='" . $conn["id"] . "'>\n");
-   print("  <from><name>" . $conn["startStation"] . "</name><id>" . $api->validate($conn["startStation"])[0]["id"] . "</id></from>\n");
-   print("  <to><name>" . $conn["endStation"] . "</name><id>" . $api->validate($conn["endStation"])[0]["id"] . "</id></to>\n");
+   print("  <from><name>" . trim($conn["startStation"]) . "</name><id>" . $api->validate($conn["startStation"])[0]["id"] . "</id></from>\n");
+   print("  <to><name>" . trim($conn["endStation"]) . "</name><id>" . $api->validate($conn["endStation"])[0]["id"] . "</id></to>\n");
    print("  <details>\n"); 
-   print("   <departure><date>" . $conn["startDate"] . "</date><time>" . $conn["startTime"] . "</time></departure>\n"); 
-   print("   <arrival><date>" . $conn["endDate"] . "</date><time>" . $conn["endTime"] . "</time></arrival>\n");
+   print("   <departure><date>" . $conn["startDate"] . "</date><time>" . trim($conn["startTime"]) . "</time></departure>\n"); 
+   print("   <arrival><date>" . $conn["endDate"] . "</date><time>" . trim($conn["endTime"]) . "</time></arrival>\n");
    print("   <duration>" . $conn["duration"] . "</duration>\n");
    print("   <changes>" . $conn["changes"] . "</changes>\n");
-   print("   <current><![CDATA[" . $conn["prognose"] . "]]></current>\n");
+   print("   <current>" . htmlspecialchars($conn["prognose"], ENT_XML1, 'UTF-8') . "</current>\n");
    print("  </details>\n");
 
    print("  <services>\n");
@@ -95,17 +95,17 @@ if ($type == "validate") {
     print("   <service id='" . $order . "'>\n");
     print("    <name>" . $service["data"]["productName"] . "</name>\n");
     print("    <departure>\n");
-    print("     <station><name>" . $service["start"]["station"] . "</name><id>" . $api->validate($service["start"]["station"])[0]["id"] . "</id></station>\n");
-    print("     <date>" . $service["start"]["date"] . "</date><time>" . $service["start"]["time"] . "</time>\n");
+    print("     <station><name>" . trim($service["start"]["station"]) . "</name><id>" . $api->validate($service["start"]["station"])[0]["id"] . "</id></station>\n");
+    print("     <date>" . $service["start"]["date"] . "</date><time>" . trim($service["start"]["time"]) . "</time>\n");
     print("     <platform>" . $service["start"]["plattform"] . "</platform>\n");
-    print("     <current><![CDATA[" . $service["start"]["prognose"] . "]]></current>");
+    print("     <current>" . htmlspecialchars($service["start"]["prognose"], ENT_XML1, 'UTF-8') . "</current>");
     print("    </departure>\n");
 
     print("    <arrival>\n");
-    print("     <station><name>" . $service["end"]["station"] . "</name><id>" . $api->validate($service["end"]["station"])[0]["id"] . "</id></station>\n"); 
-    print("     <date>" . $service["end"]["date"] . "</date><time>" . $service["end"]["time"] . "</time>\n");
+    print("     <station><name>" . trim($service["end"]["station"]) . "</name><id>" . $api->validate($service["end"]["station"])[0]["id"] . "</id></station>\n"); 
+    print("     <date>" . $service["end"]["date"] . "</date><time>" . trim($service["end"]["time"]) . "</time>\n");
     print("     <platform>" . $service["end"]["plattform"] . "</platform>\n");
-    print("     <current><![CDATA[" . $service["end"]["prognose"] . "]]></current>\n");
+    print("     <current>" . htmlspecialchars($service["end"]["prognose"], ENT_XML1, 'UTF-8') . "</current>\n");
 
     print("    </arrival>\n");
     print("   </service>\n");