diff --git a/src/ui/atlasLayerWidget/alwContainer/alwContainer.template.html b/src/ui/atlasLayerWidget/alwContainer/alwContainer.template.html
index b5d363f0c43ca270766734830f96845a3e8868c8..4f7a021a8cf289d60d95ac072605864367fc2e0d 100644
--- a/src/ui/atlasLayerWidget/alwContainer/alwContainer.template.html
+++ b/src/ui/atlasLayerWidget/alwContainer/alwContainer.template.html
@@ -107,7 +107,8 @@
     class="pe-all"
     [matBadge]="badge"
     matBadgeColor="accent"
-    (click)="handleClickWidget(tab)"
+    iav-delay-event="click"
+    (iav-delay-event-emit)="handleClickWidget(tab)"
     [iav-dynamic-mat-button-disabled]="matBtnDisabled"
     iav-dynamic-mat-button-color="primary"
     [iav-dynamic-mat-button-style]="tab === visibleTab ? 'mat-mini-fab' : 'mat-icon-button'">
diff --git a/src/ui/databrowserModule/databrowser/databrowser.template.html b/src/ui/databrowserModule/databrowser/databrowser.template.html
index f3ab4c86c479e0467030edac745d417bb9bb6949..1dc3a703e233f18e8936a7035e9fce1fa71181d9 100644
--- a/src/ui/databrowserModule/databrowser/databrowser.template.html
+++ b/src/ui/databrowserModule/databrowser/databrowser.template.html
@@ -124,7 +124,7 @@
           <button mat-icon-button
             [matTooltip]="visibleCountedDataM.length > 0 ? 'Reset filters' : null"
             iav-delay-event="click"
-            (delayedEmit)="visibleCountedDataM.length > 0 ? clearAll() : null"
+            (iav-delay-event-emit)="visibleCountedDataM.length > 0 ? clearAll() : null"
             [iav-stop]="visibleCountedDataM.length > 0 ? 'click' : null"
             [color]="visibleCountedDataM.length > 0 ? 'primary' : 'basic'">
             <i class="fas fa-filter"></i>
diff --git a/src/util/directives/delayEvent.directive.ts b/src/util/directives/delayEvent.directive.ts
index e0cd2e4f8b232075746c5d6d1df6583f5eac52ba..fa896a09f8ddcd7cd9f6e6909f2059367bc06e9c 100644
--- a/src/util/directives/delayEvent.directive.ts
+++ b/src/util/directives/delayEvent.directive.ts
@@ -22,7 +22,7 @@ export class DelayEventDirective implements OnChanges, OnDestroy {
   @Input('iav-delay-event')
   public delayEvent: string = ''
 
-  @Output()
+  @Output('iav-delay-event-emit')
   public delayedEmit: EventEmitter<any> = new EventEmitter()
 
   constructor(