diff --git a/datalets/leafletjs-datalet/demo/index.html b/datalets/leafletjs-datalet/demo/index.html
index 3036028..c665e8a 100755
--- a/datalets/leafletjs-datalet/demo/index.html
+++ b/datalets/leafletjs-datalet/demo/index.html
@@ -13,8 +13,8 @@
 <script src="https://code.jquery.com/jquery-2.1.4.min.js" type="text/javascript"></script>
 <link rel="import" href="../leafletjs-datalet.html" />
 
-<leafletjs-datalet data-url="http://ckan.routetopa.eu/api/action/datastore_search?resource_id=73e02092-85a1-434e-85fe-0c9a43aa9a52&amp;limit=10000"
-                   fields='["result,records,Lat","result,records,Lng", "result,records,Link"]'></leafletjs-datalet>
+<leafletjs-datalet data-url="http://ckan.routetopa.eu/api/action/datastore_search?resource_id=73e02092-85a1-434e-85fe-0c9a43aa9a52&amp;limit=99999" selectedfields="[{&quot;field&quot;:&quot;Latitude&quot;,&quot;value&quot;:&quot;Lat&quot;,&quot;index&quot;:1},{&quot;field&quot;:&quot;Longitude&quot;,&quot;value&quot;:&quot;Lng&quot;,&quot;index&quot;:2},{&quot;field&quot;:&quot;BalloonContent&quot;,&quot;value&quot;:&quot;Link&quot;,&quot;index&quot;:3}]" filters="[]" aggregators="[]" orders="[]" data="" fields="[&quot;Lat&quot;,&quot;Lng&quot;,&quot;Link&quot;]">
+    </leafletjs-datalet>
 
 
 </body>
diff --git a/datalets/leafletjs-datalet/leafletjs-datalet.html b/datalets/leafletjs-datalet/leafletjs-datalet.html
index 25a096b..018bcf5 100755
--- a/datalets/leafletjs-datalet/leafletjs-datalet.html
+++ b/datalets/leafletjs-datalet/leafletjs-datalet.html
@@ -91,6 +91,7 @@ Example:
                 var coordinates = [];
                 var coordinates_index  = 0;
                 var isArray = t.data[0].data[0].constructor === Array;
+                var geo;
 
                 for(var i=0; i<t.data[0].data.length; i++)
                 {
@@ -101,25 +102,34 @@ Example:
                         else
                              continue;
                     }
+                    else if(typeof t.data[0].data[i] == 'string' && t.data[0].data[i].startsWith('{"type":"'))
+                    {
+                        try
+                        {
+                            t.data[0].data[i] = JSON.parse(t.data[0].data[i]);
+                            geo = L.geoJson(t.data[0].data[i]).addTo(t._component.map);
+                        }catch(e) {continue;}
+                    }
                     else if(typeof t.data[0].data[i] == 'string' && t.data[0].data[i].indexOf(","))
                     {
                         var coords = t.data[0].data[i].split(",");
-                        if(!isNaN(coords[0]) && !isNaN(coords[1]))
+                        if(!isNaN(coords[0]) && !isNaN(coords[1])) {
                             coordinates.push([parseFloat(coords[0]), parseFloat(coords[1])]);
-                        else
+                            geo = L.marker([coordinates[coordinates_index][0], coordinates[coordinates_index][1]]).addTo(t._component.map);
+                            coordinates_index++;
+                        }else
                             continue;
                     }
                     else
                     {
-                        if(!isNaN(t.data[0].data[i]) && !isNaN(t.data[1].data[i]))
+                        if(!isNaN(t.data[0].data[i]) && !isNaN(t.data[1].data[i])) {
                             coordinates.push([parseFloat(t.data[0].data[i]), parseFloat(t.data[1].data[i])]);
-                        else
+                            geo = L.marker([coordinates[coordinates_index][0], coordinates[coordinates_index][1]]).addTo(t._component.map);
+                            coordinates_index++;
+                        }else
                             continue;
                     }
 
-                    var marker = L.marker([coordinates[coordinates_index][0], coordinates[coordinates_index][1]]).addTo(t._component.map);
-                    coordinates_index++;
-
                     if(t.data.length > 2)
                     {
                         var popupText = "";
@@ -135,7 +145,7 @@ Example:
                         }
 
                         var popup = L.popup().setContent(popupText);
-                        marker.bindPopup(popup);
+                        geo.bindPopup(popup);
                     }
                 }
 
diff --git a/datalets/leafletjs-geojson-datalet/leafletjs-geojson-datalet.html b/datalets/leafletjs-geojson-datalet/leafletjs-geojson-datalet.html
index a3f5559..d3c990f 100755
--- a/datalets/leafletjs-geojson-datalet/leafletjs-geojson-datalet.html
+++ b/datalets/leafletjs-geojson-datalet/leafletjs-geojson-datalet.html
@@ -89,16 +89,37 @@ Example:
 
                 L.Icon.Default.imagePath = 'http://services.routetopa.eu/DEEalerProvider/COMPONENTS/datalets/leafletjs-datalet/leafletsjs/images';
 
-                var bounding_box = L.geoJson(t.data[0].data);
+                var coordinates = [];
+                var coordinates_index  = 0;
+                var geo;
 
                 for (var i = 0; i < t.data[0].data.length; i++)
                 {
-                    try{
-                        if(typeof t.data[0].data[i] != 'object')
+                    if(typeof t.data[0].data[0] == 'Array')
+                    {
+                        if(!isNaN(t.data[0].data[i][0]) && !isNaN(t.data[0].data[i][1]))
+                            coordinates.push([parseFloat(t.data[0].data[i][0]), parseFloat(t.data[0].data[i][1])]);
+                        else
+                            continue;
+                    }
+                    else if(typeof t.data[0].data[i] == 'string' && t.data[0].data[i].startsWith('{"type":"'))
+                    {
+                        try
+                        {
                             t.data[0].data[i] = JSON.parse(t.data[0].data[i]);
-                    }catch(e){}
-
-                    var geoJsonLayer = L.geoJson(t.data[0].data[i]).addTo(t._component.map);
+                            geo = L.geoJson(t.data[0].data[i]).addTo(t._component.map);
+                        }catch(e) {continue;}
+                    }
+                    else if(typeof t.data[0].data[i] == 'string' && t.data[0].data[i].indexOf(","))
+                    {
+                        var coords = t.data[0].data[i].split(",");
+                        if(!isNaN(coords[0]) && !isNaN(coords[1])) {
+                            coordinates.push([parseFloat(coords[0]), parseFloat(coords[1])]);
+                            geo = L.marker([coordinates[coordinates_index][0], coordinates[coordinates_index][1]]).addTo(t._component.map);
+                            coordinates_index++;
+                        }else
+                            continue;
+                    }
 
                     if(t.data.length > 1)
                     {
@@ -115,13 +136,13 @@ Example:
                         }
 
                         var popup = L.popup().setContent(popupText);
-                        geoJsonLayer.bindPopup(popup);
+                        geo.bindPopup(popup);
                     }
                 }
 
                 t._component.map._onResize();
                 t._component.map.invalidateSize(false);
-                t._component.map.fitBounds(bounding_box);
+                t._component.map.fitBounds(coordinates);
 
             }
         };