diff --git a/datalets/leafletjs-geojson-datalet/leafletjs-geojson-datalet.html b/datalets/leafletjs-geojson-datalet/leafletjs-geojson-datalet.html
index 794b064..7a0c86b 100755
--- a/datalets/leafletjs-geojson-datalet/leafletjs-geojson-datalet.html
+++ b/datalets/leafletjs-geojson-datalet/leafletjs-geojson-datalet.html
@@ -64,7 +64,7 @@ Example:
 
     <script>
 
-        var leafletjsBehavior = {
+        var leafletjsgeojsonBehavior = {
 
             /**
              * Read markers coordinates from the data object and add the marker to the map.
@@ -88,52 +88,11 @@ Example:
 
                 L.Icon.Default.imagePath = 'http://services.routetopa.eu/DEEalerProvider/COMPONENTS/datalets/leafletjs-datalet/leafletsjs/images';
 
-                var coordinates = [];
-                var coordinates_index  = 0;
-                var isArray = t.data[0].data[0].constructor === Array;
-
-                for(var i=0; i<t.data[0].data.length; i++)
-                {
-                    if(isArray)
-                    {
-                        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(!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
-                            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 = "";
-                        for(var j=2; j<t.data.length; j++)
-                        {
-                            if(typeof t.data[j] != 'undefined' && typeof t.data[j].data[i] != 'undefined')
-                            {
-                                if (t.data[j].data[i].toString().match(new RegExp("^(http[s]?:\\/\\/(www\\.)?|ftp:\\/\\/(www\\.)?|www\\.){1}([0-9A-Za-z-\\.@:%_\+~#=]+)+((\\.[a-zA-Z]{2,3})+)(/(.)*)?(\\?(.)*)?")))
-                                    popupText += '<image height="100" width="100" src="' + t.data[j].data[i] + '" /><br/>';
-                                else
-                                    popupText += '<span>' + t.data[j].name + ' : ' + t.data[j].data[i] + '</span><br/>'
-                            }
-                        }
-
-                        var popup = L.popup().setContent(popupText);
-                        marker.bindPopup(popup);
-                    }
-                }
+                var geoJsonLayer = L.geoJson(t.data[0].data).addTo(t._component.map);
 
                 t._component.map._onResize();
                 t._component.map.invalidateSize(false);
-                t._component.map.fitBounds(coordinates);
+                t._component.map.fitBounds(geoJsonLayer);
 
             }
         };
@@ -197,7 +156,7 @@ Example:
              * @method ready
              */
             ready: function(){
-                this.behavior =  $.extend(true, {}, BaseDataletBehavior, WorkcycleBehavior, AjaxJsonAlasqlBehavior, leafletjsBehavior);
+                this.behavior =  $.extend(true, {}, BaseDataletBehavior, WorkcycleBehavior, AjaxJsonAlasqlBehavior, leafletjsgeojsonBehavior);
                 this.async(function(){this.behavior.init(this)},100);
             }
         });