diff --git a/controllets/animated-grid-controllet/animated-grid-controllet.html b/controllets/animated-grid-controllet/animated-grid-controllet.html
index 42d2d74..17f6f47 100644
--- a/controllets/animated-grid-controllet/animated-grid-controllet.html
+++ b/controllets/animated-grid-controllet/animated-grid-controllet.html
@@ -146,6 +146,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
             var target = event.target;
 
+            if(target.classList[0] != "grid-item")
+                return;
+
             // configure the page animation
             this.sharedElements = {
                 'hero': target,
diff --git a/datalets/base-datalet/base-datalet.html b/datalets/base-datalet/base-datalet.html
index 4e9d6df..07ac26b 100755
--- a/datalets/base-datalet/base-datalet.html
+++ b/datalets/base-datalet/base-datalet.html
@@ -80,16 +80,17 @@ Example :
                 width: 100%;
              }
 
+
         </style>
 
         <div id="base_datalet_imgWaitDatalet">
                 <img id="image_spin" src="static/images/spin.svg">
 
         </div>
-
         <div id="base_datalet_container">
-            <b>Source: </b><span id="domain"></span>
-            <b>  </b><span id="domainPage"></span>
+            <b> Source:</b><span id="domain"></span>
+            <b>  </b><span id="domainPage">
+        </span>
             <div id="base_datalet_rtp">
                 <div id="rtp">Powered by ROUTE-TO-PA</div>
                 <div><a href="http://www.routetopa.eu/"><img id="rtpalogo" src="static/images/rtpalogo.png" ></a></div>
@@ -134,8 +135,6 @@ Example :
                 var urlDatalet;
                 if(this.dataUrl != undefined){
 
-                    urlSource =  this.dataUrl.split("/")[0] + "//" + this.dataUrl.split("/")[2];
-
                     var apiIdResource = "resource_show?id=";
 
                     //Resourceid of a datalet
@@ -148,10 +147,10 @@ Example :
                     queryFinal = this.dataUrl.substring(this.dataUrl.indexOf("api"),  this.dataUrl.indexOf("datastore_search"));
 
                     urlDatalet = queryInitial +  queryFinal + apiIdResource + resultIdDatalet;
+                    urlSource = this.dataUrl.split("/")[0] + "//" + this.dataUrl.split("/")[2];
 
+                    this.$.domainPage.innerHTML = '<a href=' + urlSource +  ' target=' + "_blank>" + urlSource + '</a>'+ "." ;
                     this.requestDataletData(urlDatalet);
-                    //String  source to define for Issy
-                    this.$.domain.textContent = this.dataUrl.split("/")[0] + "//" + this.dataUrl.split("/")[2];
                 }
             },
             /**
@@ -214,10 +213,9 @@ Example :
                     urlDatalet = urlDatasetDownload.replace(/\/download\/.*/, '');
                     urlSource =  this.dataUrl.split("/")[0] + "//" + this.dataUrl.split("/")[2];
 
-                    //this.$.domain.textContent = this.dataUrl.split("/")[0] + "//" + this.dataUrl.split("/")[2];
 
-                    //this.$.domainPage.innerHTML = '<a href=' + urlSource +  ' target=' + "_blank>" + " urlSource" + '</a>';
-                    this.$.domainPage.innerHTML = '<a href=' + urlDatalet +  ' target=' + "_blank>" + " Dataset's page" + '</a>';
+                    this.$.domainPage.innerHTML += " (" + ' <a href=' + urlDatalet +  ' target=' + "_blank>" + "Dataset's page" + '</a>' + " )";
+
                 }
             }
         });
diff --git a/datalets/datasetexplorer-datalet/datasetexplorer-datalet.html b/datalets/datasetexplorer-datalet/datasetexplorer-datalet.html
index af605b7..3639065 100755
--- a/datalets/datasetexplorer-datalet/datasetexplorer-datalet.html
+++ b/datalets/datasetexplorer-datalet/datasetexplorer-datalet.html
@@ -30,6 +30,7 @@
 -->
 
 <link rel="import" href="../base-ajax-json-jsonpath-datalet/base-ajax-json-jsonpath-datalet.html">
+<link rel="import" href="../base-ajax-json-jsonpath-datalet/base-ajax-json-jsonpath-datalet.html">
 
 <!--
 
@@ -120,11 +121,10 @@ Example:
 
             }
         </style>
-        <div id="treemap_placeholder"><img class="spinner" src="spin.svg" /></div>
+        <div id="treemap_placeholder"></div>
         <base-ajax-json-jsonpath-datalet data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></base-ajax-json-jsonpath-datalet>
     </template>
 
-    <!--<script src="../shared_js/d3.js"></script>-->
     <script src="../shared_js/d3.js"></script>
     <script src="js/buildtreemap.js"></script>
     <script>
diff --git a/datalets/datasetexplorer-datalet/js/buildtreemap.js b/datalets/datasetexplorer-datalet/js/buildtreemap.js
index 44dc117..a1937f4 100755
--- a/datalets/datasetexplorer-datalet/js/buildtreemap.js
+++ b/datalets/datasetexplorer-datalet/js/buildtreemap.js
@@ -28,8 +28,6 @@ function build(root, place_holder, select_listener) {
         .ratio(height / width * 0.5 * (1 + Math.sqrt(5)))
         .round(false);
 
-    d3.select("#" + place_holder).selectAll('*').remove();
-
     var svg = d3.select("#" + place_holder)
         .append("svg")
         .attr("width", width + margin.left + margin.right)
@@ -179,9 +177,29 @@ function build(root, place_holder, select_listener) {
         }
 
         if (!d._children[0]._children) {
-            //grandparent.dispatchEvent(new CustomEvent('select', { detail: d._children[0].name }));
             if (select_listener) {
-                select_listener(d._children[0].name);
+                var url = d._children[0].name;
+
+                // Check if CKAN
+                var strDatasetPos = url.indexOf('/dataset/');
+                var strResourcePos = (strDatasetPos >= 0) ? url.indexOf('/resource/') : -1;
+                if (strDatasetPos >= 0 && strResourcePos > strDatasetPos) {
+                    var urlSegment1 = url.substring(0, strDatasetPos);
+                    var urlResourceEnd = url.indexOf('/', strResourcePos + 10);
+                    var resourceId = url.substring(strResourcePos + 10, urlResourceEnd);
+                    url = urlSegment1 + "/api/action/datastore_search?resourceid=" + resourceId;
+                }
+
+                // Check if OPENDATASOFT
+                var strExploreDatasetPos = url.indexOf('/explore/dataset/');
+                if (strExploreDatasetPos >= 0) {
+                    var urlSegment1 = url.substring(0, strExploreDatasetPos);
+                    var datasetEnd = url.indexOf(strExploreDatasetPos + 17, '/');
+                    var datasetId = url.substring(strExploreDatasetPos + 17, datasetEnd >= 0 ? datasetEnd : url.length);
+                    url = urlSegment1 + '/api/records/1.0/search?dataset=' + datasetId;
+                }
+
+                select_listener(url);
             }
 
             var dataurl = d._children[0].name;
@@ -211,7 +229,8 @@ function build(root, place_holder, select_listener) {
         d.each(function(){
             var text = d3.select(this),
                 d = text[0][0].__data__,
-                words = d.name.trim().split(/\s+|\./).reverse(),
+                name = d.name.trim(),
+                words = name.search(/\s+/) >= 0 ? name.split(/\s+/).reverse() : [name],
                 word = words.pop(),
                 line = [word],
                 lineNumber = 0,
@@ -234,7 +253,8 @@ function build(root, place_holder, select_listener) {
                     .append("tspan")
                     .attr("x", fx(d.x) + 6)
                     .attr("y", fy(d.y) + 6)
-                    .attr("dy", lineNumber++ * lineHeight + dy + "em");
+                    .attr("dy", lineNumber++ * lineHeight + dy + "em")
+                    .text(word);
             var width = fx(d.x + d.dx) - fx(d.x) - 12;
             var height = fy(d.y + d.dy) - fy(d.y) - 6;
 
diff --git a/datalets/datasetexplorer-datalet/spin.svg b/datalets/datasetexplorer-datalet/spin.svg
deleted file mode 100755
index 5b931d7..0000000
--- a/datalets/datasetexplorer-datalet/spin.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><svg width='198px' height='198px' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid" class="uil-spin"><rect x="0" y="0" width="100" height="100" fill="none" class="bk"></rect><g transform="translate(50 50)"><g transform="rotate(0) translate(34 0)"><circle cx="0" cy="0" r="8" fill="#1976d2"><animate attributeName="opacity" from="1" to="0.1" begin="0s" dur="1s" repeatCount="indefinite"></animate><animateTransform attributeName="transform" type="scale" from="1.5" to="1" begin="0s" dur="1s" repeatCount="indefinite"></animateTransform></circle></g><g transform="rotate(45) translate(34 0)"><circle cx="0" cy="0" r="8" fill="#1976d2"><animate attributeName="opacity" from="1" to="0.1" begin="0.12s" dur="1s" repeatCount="indefinite"></animate><animateTransform attributeName="transform" type="scale" from="1.5" to="1" begin="0.12s" dur="1s" repeatCount="indefinite"></animateTransform></circle></g><g transform="rotate(90) translate(34 0)"><circle cx="0" cy="0" r="8" fill="#1976d2"><animate attributeName="opacity" from="1" to="0.1" begin="0.25s" dur="1s" repeatCount="indefinite"></animate><animateTransform attributeName="transform" type="scale" from="1.5" to="1" begin="0.25s" dur="1s" repeatCount="indefinite"></animateTransform></circle></g><g transform="rotate(135) translate(34 0)"><circle cx="0" cy="0" r="8" fill="#1976d2"><animate attributeName="opacity" from="1" to="0.1" begin="0.37s" dur="1s" repeatCount="indefinite"></animate><animateTransform attributeName="transform" type="scale" from="1.5" to="1" begin="0.37s" dur="1s" repeatCount="indefinite"></animateTransform></circle></g><g transform="rotate(180) translate(34 0)"><circle cx="0" cy="0" r="8" fill="#1976d2"><animate attributeName="opacity" from="1" to="0.1" begin="0.5s" dur="1s" repeatCount="indefinite"></animate><animateTransform attributeName="transform" type="scale" from="1.5" to="1" begin="0.5s" dur="1s" repeatCount="indefinite"></animateTransform></circle></g><g transform="rotate(225) translate(34 0)"><circle cx="0" cy="0" r="8" fill="#1976d2"><animate attributeName="opacity" from="1" to="0.1" begin="0.62s" dur="1s" repeatCount="indefinite"></animate><animateTransform attributeName="transform" type="scale" from="1.5" to="1" begin="0.62s" dur="1s" repeatCount="indefinite"></animateTransform></circle></g><g transform="rotate(270) translate(34 0)"><circle cx="0" cy="0" r="8" fill="#1976d2"><animate attributeName="opacity" from="1" to="0.1" begin="0.75s" dur="1s" repeatCount="indefinite"></animate><animateTransform attributeName="transform" type="scale" from="1.5" to="1" begin="0.75s" dur="1s" repeatCount="indefinite"></animateTransform></circle></g><g transform="rotate(315) translate(34 0)"><circle cx="0" cy="0" r="8" fill="#1976d2"><animate attributeName="opacity" from="1" to="0.1" begin="0.87s" dur="1s" repeatCount="indefinite"></animate><animateTransform attributeName="transform" type="scale" from="1.5" to="1" begin="0.87s" dur="1s" repeatCount="indefinite"></animateTransform></circle></g></g></svg>
\ No newline at end of file