diff --git a/src/app/cesium-map/csmap.component.ts b/src/app/cesium-map/csmap.component.ts
index 9b122d48..caa5c62c 100644
--- a/src/app/cesium-map/csmap.component.ts
+++ b/src/app/cesium-map/csmap.component.ts
@@ -184,17 +184,14 @@ export class CsMapComponent implements AfterViewInit {
     const nvclanid = UtilitiesService.getUrlParameterByName('nvclanid');
     if (nvclanid) {
       const me = this;
-
-        this.nvclBoreholeAnalyticService.getNVCLGeoJson(nvclanid).subscribe(results => {
-          if (typeof results === 'object') {
-            window.alert('This analytical job could not be found!\n the nvclanid = ' + nvclanid);
-            return;
-          }
+      this.nvclBoreholeAnalyticService.getNVCLGeoJson(nvclanid).subscribe(results => {
+        if (typeof results === 'object') {
+          window.alert('This analytical job could not be found!\n the nvclanid = ' + nvclanid);
+        } else {
           const jsonData = results;
           me.nvclBoreholeAnalyticService.addGeoJsonLayer(nvclanid,jsonData);
-        });
-
-      return;
+        }
+      });
     }
 
     // This code is used to display the map state stored in a permanent link
diff --git a/src/app/menupanel/common/filterpanel/filterpanel.component.ts b/src/app/menupanel/common/filterpanel/filterpanel.component.ts
index cb5d615f..060e27c9 100644
--- a/src/app/menupanel/common/filterpanel/filterpanel.component.ts
+++ b/src/app/menupanel/common/filterpanel/filterpanel.component.ts
@@ -95,16 +95,6 @@ export class FilterPanelComponent implements OnInit, AfterViewInit {
     // Add any layer specific advanced filter components
     this.advancedComponentService.addAdvancedFilterComponents(this.layer, this.advancedFilterComponents);
 
-    // LJ: nvclAnalyticalJob external link
-    const nvclanid = UtilitiesService.getUrlParameterByName('nvclanid');
-    if (nvclanid) {
-      if (this.layer.id === 'nvcl-v2-borehole') {
-        this.layer.filterCollection['mandatoryFilters'][0].value = nvclanid;
-        setTimeout(() => {
-          this.addLayer(this.layer);
-        });
-      }
-    }
   }
 
   /**