diff --git a/src/app/pages/tecnalia-module/bike-analysis/bike-analysis.component.ts b/src/app/pages/tecnalia-module/bike-analysis/bike-analysis.component.ts
index 10e9ffa874a95cd44176705579c560e076ad0c57..80662b1ef5bea6818e1500022646f7c95bae5e2a 100644
--- a/src/app/pages/tecnalia-module/bike-analysis/bike-analysis.component.ts
+++ b/src/app/pages/tecnalia-module/bike-analysis/bike-analysis.component.ts
@@ -755,9 +755,11 @@ export class BikeAnalysisComponent implements OnInit {
        sel.remove(i);
     }
     for(let ele in data){
+      //console.log(JSON.stringify(data[ele]));
+      let jj = data[ele]['geojson'];
       var opt = document.createElement('option');
-      opt.value = data[ele];
-      opt.innerHTML = data[ele];
+      opt.value = jj['name'];
+      opt.innerHTML = jj['name'];
       sel.appendChild(opt);
     }
   }
diff --git a/src/app/pages/tecnalia-module/noise-comp/noise-comp.component.ts b/src/app/pages/tecnalia-module/noise-comp/noise-comp.component.ts
index 52556c77079b7ce6296df60f7b6db5130c28fcca..f6ac20b3bd6d11f28648de6dc5636e7afb4e4d1a 100644
--- a/src/app/pages/tecnalia-module/noise-comp/noise-comp.component.ts
+++ b/src/app/pages/tecnalia-module/noise-comp/noise-comp.component.ts
@@ -291,19 +291,21 @@ export class NoiseCompComponent implements OnInit {
   getNewGeoJSONS0(data,ttype){
     var select = document.getElementById("newgeojson_combo");
     select.innerHTML = "";
-    console.log('getNewGeoJSONS0::: data='+JSON.stringify(data));
-    this.newgeojson_names = [];
-    for(var i = 0; i < data.length; i++) {
-        console.log("getNewGeoJSONS0::: data["+i+"]="+JSON.stringify(data[i]));
-        var opt = data[i];
-        var el = document.createElement("option");
-        el.textContent = i+": "+opt["name"];
-        this.newgeojson_names.push(opt["name"]);
-        this.newgeojsons.push(opt);
-        el.value = i+"";
-        console.log("getNewGeoJSONS0::: value="+el.value);
-        select.appendChild(el);
-    };
+    if ( data != null ){
+      console.log('getNewGeoJSONS0::: data='+JSON.stringify(data));
+      this.newgeojson_names = [];
+      for(var i = 0; i < data.length; i++) {
+          console.log("getNewGeoJSONS0::: data["+i+"]="+JSON.stringify(data[i]));
+          var opt = data[i];
+          var el = document.createElement("option");
+          el.textContent = i+": "+opt["name"];
+          this.newgeojson_names.push(opt["name"]);
+          this.newgeojsons.push(opt);
+          el.value = i+"";
+          console.log("getNewGeoJSONS0::: value="+el.value);
+          select.appendChild(el);
+      };
+    }
     if ( ttype === 1 ){
       this.getMapsFromDB(ttype);
     }