diff --git a/deploy/csp/index.js b/deploy/csp/index.js
index cfc8cb82bdd2c6266769c5556dc04cee375bd7b1..51a3cf1598f93b61e0efdc38f4a2e80d40aba68c 100644
--- a/deploy/csp/index.js
+++ b/deploy/csp/index.js
@@ -108,6 +108,7 @@ module.exports = {
           "'self'",
           ...userScriptSrc,
           'unpkg.com/kg-dataset-previewer@1.2.0/', // preview component
+          'cdnjs.cloudflare.com/ajax/libs/d3/', // required for preview component
           'cdnjs.cloudflare.com/ajax/libs/mathjax/', // math jax
           'https://unpkg.com/three-surfer@0.0.11/dist/bundle.js', // for threeSurfer (freesurfer support in browser)
           'https://unpkg.com/ng-layer-tune@0.0.5/dist/ng-layer-tune/', // needed for ng layer control
diff --git a/src/viewerModule/nehuba/annotation/service.ts b/src/viewerModule/nehuba/annotation/service.ts
index 0bfd9f92666ffbb9a5a29708f56c9fcc42858d4e..fcc109e8f6cc6b81f561e48c42c8123f62107a3e 100644
--- a/src/viewerModule/nehuba/annotation/service.ts
+++ b/src/viewerModule/nehuba/annotation/service.ts
@@ -23,7 +23,8 @@ export class NgAnnotationService implements OnDestroy {
 
   static GET_ANN_LAYER(ann: annotation.UnionAnnotation): AnnotationLayer {
     const color = ann.color || annotation.AnnotationColor.WHITE
-    const layerName = `${NgAnnotationService.ANNOTATION_LAYER_NAME}-${annotation.AnnotationColor[color]}`
+    const layerEnum = annotation.AnnotationColor[color] || annotation.AnnotationColor.WHITE
+    const layerName = `${NgAnnotationService.ANNOTATION_LAYER_NAME}-${layerEnum}`
 
     const annLayer = AnnotationLayer.Get(layerName, NgAnnotationService.COLOR_MAP.get(color) || "#ffffff")
     NgAnnotationService.INIT_LAYERS.add(layerName)
@@ -35,6 +36,7 @@ export class NgAnnotationService implements OnDestroy {
       const layer = AnnotationLayer.Get(layername, '#ffffff')
       layer.dispose()
     })
+    NgAnnotationService.INIT_LAYERS.clear()
     while(this.subs.length) this.subs.pop().unsubscribe()
   }