diff --git a/index.html b/index.html
index f44981b66..1a08b18b5 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
     <script src="./dist/aframe-street-component.js"></script>
 
     <!-- mapbox -->
-    <script src="https://unpkg.com/aframe-mapbox-component/dist/aframe-mapbox-component.min.js"></script>
+    <script src="./src/lib/aframe-mapbox-component.min.js"></script>
 
     <!-- save / load -->
     <script src="./src/json-utils.js"></script>
diff --git a/src/json-utils.js b/src/json-utils.js
index af45e94f4..9dfe52103 100644
--- a/src/json-utils.js
+++ b/src/json-utils.js
@@ -7,7 +7,8 @@ and returns a Javascript object
 function convertDOMElToObject (entity) {
   const data = [];
   const environmentElement = document.querySelector('#environment');
-  const sceneEntities = [entity, environmentElement];
+  const layers2DElement = document.querySelector('#layers-2d');
+  const sceneEntities = [entity, environmentElement, layers2DElement];
 
   for (const entry of sceneEntities) {
     const entityData = getElementData(entry);
@@ -83,7 +84,8 @@ function getAttributes (entity) {
 }
 
 function toPropString (propData) {
-  if (typeof propData === 'string' || typeof propData === 'number' || typeof propData === 'boolean') {
+  if (typeof propData === 'string' || typeof propData === 'number' || typeof propData === 'boolean' ||
+    Array.isArray(propData)) {
     return (propData).toString();
   }
   if (propData.isVector3 || propData.isVector2 || propData.isVector4 ||