diff --git a/demo/src/app/geo/hover/hover.component.ts b/demo/src/app/geo/hover/hover.component.ts
index a181f31614..f7fc8bf467 100644
--- a/demo/src/app/geo/hover/hover.component.ts
+++ b/demo/src/app/geo/hover/hover.component.ts
@@ -97,7 +97,7 @@ export class AppHoverComponent {
         featureTypes: 'CASERNE',
         fieldNameGeometry: 'geometry',
         maxFeatures: 10000,
-        version: '3.0.0',
+        version: '2.0.0',
         outputFormat: undefined,
         outputFormatDownload: 'shp'
       }
diff --git a/packages/context/src/lib/context-manager/shared/context.service.ts b/packages/context/src/lib/context-manager/shared/context.service.ts
index 1ca33a3fef..4f2d09ce53 100644
--- a/packages/context/src/lib/context-manager/shared/context.service.ts
+++ b/packages/context/src/lib/context-manager/shared/context.service.ts
@@ -449,7 +449,7 @@ export class ContextService {
         )
         .sort((a, b) => a.zIndex - b.zIndex);
     } else {
-      layers = igoMap.layers$.getValue().sort((a, b) => a.zIndex - b.zIndex);
+      layers = igoMap.layers$.getValue().filter(lay => !lay.id.includes('WfsWorkspaceTableDest')).sort((a, b) => a.zIndex - b.zIndex);
     }
 
     let i = 0;
@@ -569,13 +569,14 @@ export class ContextService {
               }
             );
           } else {
-          //   features = writer.writeFeatures(
-          //     layer.ol.getSource().getFeatures(),
-          //     {
-          //       dataProjection: 'EPSG:4326',
-          //       featureProjection: 'EPSG:3857'
-          //     }
-          //   );
+            const source = layer.ol.getSource() as any;
+            features = writer.writeFeatures(
+              source.getFeatures(),
+              {
+                dataProjection: 'EPSG:4326',
+                featureProjection: 'EPSG:3857'
+              }
+            );
           }
           features = JSON.parse(features);
           features.name = layer.options.title;
diff --git a/packages/geo/src/lib/layer/shared/layers/vector-layer.ts b/packages/geo/src/lib/layer/shared/layers/vector-layer.ts
index f459f126be..ee382cfb2a 100644
--- a/packages/geo/src/lib/layer/shared/layers/vector-layer.ts
+++ b/packages/geo/src/lib/layer/shared/layers/vector-layer.ts
@@ -74,9 +74,6 @@ export class VectorLayer extends Layer {
     }
 
     const vector = new olLayerVector(olOptions);
-    // const vectorSource = (this.dataSource instanceof ClusterDataSource
-    //   ? vector.getSource().
-    //   : vector.getSource()) as olSourceVector<OlGeometry>;
     const vectorSource = vector.getSource() as olSourceVector<OlGeometry>;
     const url = vectorSource.getUrl();
     if (url) {
diff --git a/packages/geo/src/lib/map/shared/map.ts b/packages/geo/src/lib/map/shared/map.ts
index eec2289ede..d55b56ba88 100644
--- a/packages/geo/src/lib/map/shared/map.ts
+++ b/packages/geo/src/lib/map/shared/map.ts
@@ -273,7 +273,7 @@ export class IgoMap {
 
   getLayerByOlUId(olUId: string): Layer {
     return this.layers.find(
-      (layer: Layer) => layer.ol.get('ol_uid') && layer.ol.get('ol_uid') === olUId
+      (layer: Layer) => (layer.ol as any).ol_uid && (layer.ol as any).ol_uid === olUId
     );
   }
 
diff --git a/packages/geo/src/lib/measure/measurer/measurer.component.ts b/packages/geo/src/lib/measure/measurer/measurer.component.ts
index 27743509bc..ea294df448 100644
--- a/packages/geo/src/lib/measure/measurer/measurer.component.ts
+++ b/packages/geo/src/lib/measure/measurer/measurer.component.ts
@@ -574,7 +574,7 @@ export class MeasurerComponent implements OnInit, OnDestroy {
       source: new FeatureDataSource(),
       style: createMeasureLayerStyle(),
       showInLayerList: true,
-      exportable: false,
+      exportable: true,
       browsable: false,
       workspace: { enabled: false }
     });