diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 017b54f..340dd96 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 017b54f57ca6495c78942995a1e010ac3c979372
+Subproject commit 340dd96dc21697a0e1ecf9a76b63e646c14a3490
diff --git a/src/app/shared/monitor/monitor.component.html b/src/app/shared/monitor/monitor.component.html
index eecab12..e3ac6d5 100644
--- a/src/app/shared/monitor/monitor.component.html
+++ b/src/app/shared/monitor/monitor.component.html
@@ -36,17 +36,17 @@
                                     <div *ngIf="indicator.description || indicator.additionalDescription"
                                          class="uk-position-top-right uk-text-center uk-margin-small-top uk-margin-small-right uk-visible@m">
                                         <a class="uk-display-inline-block uk-button uk-button-link" uk-tooltip="Note"
-                                           (click)="toggleOverlay($event, indicator, 'desc')">
+                                           (click)="changeOverlay($event, indicator, 'description')">
                                             <span class="uk-flex uk-flex-middle">
                                               <icon name="analytics" type="outlined" [flex]="true"></icon>
                                             </span>
                                         </a>
                                     </div>
                                 </div>
-                                <div *ngIf="indicator.overlay && (indicator.description || indicator.additionalDescription)" click-outside-or-esc class="uk-overflow-auto" (clickOutside)="closeOverlay($event, indicator, 'desc')">
+                                <div *ngIf="indicator.overlay && (indicator.description || indicator.additionalDescription)" click-outside-or-esc class="uk-overflow-auto" (clickOutside)="closeOverlay($event, indicator)">
                                     <div class="uk-position-top-right uk-text-center uk-margin-small-top uk-margin-small-right">
                                         <a class="uk-display-inline-block uk-button uk-button-link"
-                                           (click)="toggleOverlay($event, indicator, 'desc')">
+                                           (click)="changeOverlay($event, indicator, false)">
                                             <span class="uk-flex uk-flex-middle">
                                               <icon name="close" type="outlined" [flex]="true"></icon>
                                             </span>
@@ -128,14 +128,14 @@
                                 <div class="uk-position-bottom-left uk-margin-left uk-margin-small-bottom uk-visible@m">
                                   <a *ngIf="indicator.description || indicator.additionalDescription" 
                                     class="uk-display-inline-block uk-button uk-button-link uk-margin-right"
-                                    (click)="toggleOverlay($event, indicator, 'desc')">
+                                     (click)="changeOverlay($event, indicator, 'description')">
                                     <span class="uk-flex uk-flex-middle">
                                       <icon name="analytics" type="outlined" [flex]="true"></icon>
                                       <span class="uk-margin-xsmall-left">Note</span>
                                     </span>
                                   </a>
                                   <a class="uk-display-inline-block uk-button uk-button-link"
-                                    (click)="toggleOverlay($event, indicator, 'embed')">
+                                    (click)="changeOverlay($event, indicator, 'embed')">
                                     <span class="uk-flex uk-flex-middle">
                                       <icon name="code" type="outlined" [flex]="true"></icon>
                                       <span class="uk-margin-xsmall-left">Embed</span>
@@ -143,11 +143,11 @@
                                   </a>
                                 </div>
                                 <div *ngIf="indicator.overlay" class="indicator-overlay uk-card uk-card-default uk-flex uk-flex-middle uk-flex-center">
-                                  <div *ngIf="descriptionOverlay" class="inner" click-outside-or-esc
-                                    (clickOutside)="closeOverlay($event, indicator, 'desc')">
+                                  <div *ngIf="indicator.overlay == 'description'" class="inner" click-outside-or-esc
+                                    (clickOutside)="closeOverlay($event, indicator)">
                                     <div class="uk-padding-small">
                                       <div class="uk-flex uk-flex-right">
-                                        <button class="uk-close uk-icon" (click)="toggleOverlay($event, indicator, 'desc')">
+                                          <button class="uk-close uk-icon" (click)="changeOverlay($event, indicator, false)">
                                             <icon name="close" ratio="1"></icon>
                                         </button>
                                       </div>
@@ -161,11 +161,11 @@
                                       </div>
                                     </div>
                                   </div>
-                                  <div *ngIf="embedOverlay" class="inner" click-outside-or-esc
-                                    (clickOutside)="closeOverlay($event, indicator, 'embed')">
+                                  <div *ngIf="indicator.overlay === 'embed'" class="inner" click-outside-or-esc
+                                       (clickOutside)="closeOverlay($event, indicator)">
                                     <div class="uk-padding-small">
                                       <div class="uk-flex uk-flex-right">
-                                        <button class="uk-close uk-icon" (click)="toggleOverlay($event, indicator, 'embed')">
+                                          <button class="uk-close uk-icon" (click)="changeOverlay($event, indicator, false)">
                                           <icon name="close" ratio="1"></icon>
                                         </button>
                                       </div>