diff --git a/tileserver.php b/tileserver.php
index 32af253..f15950b 100644
--- a/tileserver.php
+++ b/tileserver.php
@@ -167,7 +167,7 @@ class Server {
 
     $resultdata = $result->fetchAll();
     foreach ($resultdata as $r) {
-      $metadata[$r['name']] = $r['value'];
+      $metadata[$r['name']] = addslashes($r['value']);
     }
     $metadata = $this->metadataValidation($metadata);
     $mbt = explode('.', $mbt);
@@ -535,7 +535,7 @@ class Json extends Server {
       echo 'TileServer: unknown map ' . $basename;
       die;
     }
-    return $output;
+    return stripslashes($output);
   }
 
   /**