diff --git a/demo/current-location.html b/demo/current-location.html
index a2edfb3..a85eefe 100644
--- a/demo/current-location.html
+++ b/demo/current-location.html
@@ -75,13 +75,13 @@
 		  filter-name="currentLocation.coords"
 		  filter-operator="$geoWithin"
 		  filter-value="[ [-73, 40], 100 ]"
-		  data-value_type="raw"
+		  filter-value_type="raw"
 		  filter-type="$center">
 		</div>
 		  <!--filter-value="[ [-73, 40], 100 ]"-->
 		<!--  filter-value="[ [-73.92709975146482, 40.6969990195153],[-73.88944153689573, 40.70675942292492] ]"-->
         
-        <input type="hidden" filter-name="currentLocation" filter-operator="$geoWithin" data-value_type="polygon" value="<coordinates>">
+        <input type="hidden" filter-name="currentLocation" filter-operator="$geoWithin" filter-value_type="polygon" value="<coordinates>">
 
     </div> 
     
diff --git a/demo/direction.html b/demo/direction.html
index d5e2304..6f16cc5 100644
--- a/demo/direction.html
+++ b/demo/direction.html
@@ -32,11 +32,11 @@
                                 <input type="hidden" data-direction="waypoint" data-map_id="0" data-place="latitude" placeholder="Latitude" data-place_id="4">
                             </div>
                         </div>
-                        <span style="float:right;"><a data-clone_id="waypoint" class="deleteBtn noDrag"><i class="fas fa-times"></i></a></span>
+                        <span style="float:right;"><a clone_id="waypoint" class="deleteBtn noDrag"><i class="fas fa-times"></i></a></span>
                         <!--  -->
                     </div>
                 </div>
-                <a data-clone_id="waypoint" class="cloneBtn noDrag" style="display: block">Add waypoint</a>
+                <a clone_id="waypoint" class="cloneBtn noDrag" style="display: block">Add waypoint</a>
                 <div class="Sortable waypoints" dnd-group-name="Sort">
                     <div id="waypoint1" class="template Sort">
                         <div style="display:inline-block;width: calc(100% - 20px);">
@@ -46,11 +46,11 @@
                                 <input type="hidden" data-direction="waypoint" data-map_id="0" data-place="latitude" placeholder="Latitude" data-place_id="5">
                             </div>
                         </div>
-                        <span style="float:right;"><a data-clone_id="waypoint" class="deleteBtn noDrag"><i class="fas fa-times"></i></a></span>
+                        <span style="float:right;"><a clone_id="waypoint" class="deleteBtn noDrag"><i class="fas fa-times"></i></a></span>
                         <!--  -->
                     </div>
                 </div>
-                <a data-clone_id="waypoint1" class="cloneBtn noDrag" style="display: block">Add waypoint</a>
+                <a clone_id="waypoint1" class="cloneBtn noDrag" style="display: block">Add waypoint</a>
                 <div>
                     <input type="text" data-map_autocomplete="true" data-direction="destination" data-map_id="0" data-place="address" placeholder="Destination" class="main-search floating-label_field" data-place_id="1" style="width:100%" autocomplete="off">
                     <input type="hidden" data-direction="destination" data-map_id="0" data-place="longitude" placeholder="Longitude" data-place_id="1">
diff --git a/demo/fleet-tracking.html b/demo/fleet-tracking.html
index c3c8059..027f8e5 100644
--- a/demo/fleet-tracking.html
+++ b/demo/fleet-tracking.html
@@ -75,13 +75,13 @@
 		  filter-name="currentLocation.coords"
 		  filter-operator="$geoWithin"
 		  filter-value="[ [-73, 40], 100 ]"
-		  data-value_type="raw"
+		  filter-value_type="raw"
 		  filter-type="$center">
 		</div>
 		<!-- filter-type="$center" filter-value="[ [-73, 40], 100 ]"-->
 		<!-- filter-type="$box" filter-value="[ [-73.92709975146482, 40.6969990195153],[-73.88944153689573, 40.70675942292492] ]"-->
         
-        <input type="hidden" filter-name="currentLocation" filter-operator="$geoWithin" data-value_type="polygon" value="<coordinates>">
+        <input type="hidden" filter-name="currentLocation" filter-operator="$geoWithin" filter-value_type="polygon" value="<coordinates>">
 
     </div> 
     
diff --git a/docs/index.html b/docs/index.html
index d8a38e1..7b86c2f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -17,13 +17,13 @@
 	</head>
 
     <body>
-		<nav class="nav display:flex align-items:center background:whitesmoke padding-top:10px padding-bottom:10px" data-main_content_id="content" scroll="sticky-nav,hide-nav" scroll-up="10" scroll-down="10" collection="components" document_id="60395ef42b3ac232657040fd" name="html">
+		<nav class="nav display:flex align-items:center background:whitesmoke padding-top:10px padding-bottom:10px" main-content_id="content" scroll="sticky-nav,hide-nav" scroll-up="10" scroll-down="10" collection="components" document_id="60395ef42b3ac232657040fd" name="html">
 		</nav>
 		<sidenav id="menuL" class="cocreate-sidenav background:whitesmoke" data-main_content="content" sidenav-default_desktop="expanded" sidenav-default_tablet="offcanvas" sidenav-ontoggle_desktop="offcanvas" sidenav-ontoggle_tablet="expanded">
 			<menu collection="components" document_id="603717b07de7fb350ae9fec8" name="html"></menu>
 			<div class="resizeHandler"></div>
 	    </sidenav>
-        <main class="padding-top:15px padding:15px@lg@xl" data-main_content_id="content" id="cocreate-google-maps">
+        <main class="padding-top:15px padding:15px@lg@xl" main-content_id="content" id="cocreate-google-maps">
             <div class="display:flex flex-wrap:wrap justify-content:space-between position:relative margin:10px">
                 <div class="display:flex align-items:center">
                     <h2>CoCreate-google-maps</h2>