diff --git a/e2e/util/selenium/iav.js b/e2e/util/selenium/iav.js
index f939460277affef8e097fdb1c487eec6e87b9203..9033825557d3196812de73d479e5b6d34cf60d90 100644
--- a/e2e/util/selenium/iav.js
+++ b/e2e/util/selenium/iav.js
@@ -17,7 +17,7 @@ class WdIavPage extends WdLayoutPage{
   }
 
   async waitUntilAllChunksLoaded(){
-    await this.waitForCss(`ui-nehuba-container`)
+    await this.waitForCss(`iav-cmp-viewer-nehuba-glue`)
     await this._browser.wait(async () => {
       const els = await this._browser.findElements(
         By.css('div.loadingIndicator')
diff --git a/e2e/util/selenium/layout.js b/e2e/util/selenium/layout.js
index dd52470db14b26fc25941e0bb70977c28feb36fb..6a16ae056362dd19b8bc9745761657c6ea71cbb6 100644
--- a/e2e/util/selenium/layout.js
+++ b/e2e/util/selenium/layout.js
@@ -423,24 +423,24 @@ class WdLayoutPage extends WdBase{
    */
   _getSideNavPrimary(){
     return this._browser.findElement(
-      By.css('mat-drawer[data-mat-drawer-primary-open]')
+      By.css('mat-drawer[data-mat-drawer-top-open]')
     )
   }
 
   async _getSideNavPrimaryExpanded(){
     return (await this._getSideNavPrimary()
-      .getAttribute('data-mat-drawer-primary-open')) === 'true'
+      .getAttribute('data-mat-drawer-top-open')) === 'true'
   }
 
   _getSideNavSecondary(){
     return this._browser.findElement(
-      By.css('mat-drawer[data-mat-drawer-secondary-open]')
+      By.css('mat-drawer[data-mat-drawer-fullleft-open]')
     )
   }
 
   async _getSideNavSecondaryExpanded(){
     return (await this._getSideNavSecondary()
-      .getAttribute('data-mat-drawer-secondary-open')) === 'true'
+      .getAttribute('data-mat-drawer-fullleft-open')) === 'true'
   }
 
   async _setSideNavPrimaryExpanded(flag) {
diff --git a/src/viewerModule/nehuba/nehubaViewerGlue/nehubaViewerGlue.component.ts b/src/viewerModule/nehuba/nehubaViewerGlue/nehubaViewerGlue.component.ts
index e0bace5b024bfcb7d65cd786afc6c77478d878c6..60364768746e4b061108558dcd48c7918b0959cf 100644
--- a/src/viewerModule/nehuba/nehubaViewerGlue/nehubaViewerGlue.component.ts
+++ b/src/viewerModule/nehuba/nehubaViewerGlue/nehubaViewerGlue.component.ts
@@ -130,12 +130,17 @@ export class NehubaGlueCmp implements IViewer, OnChanges, OnDestroy{
       selectedParcellation,
       selectedTemplate
     } = sc
-    if (selectedTemplate?.previousValue) {
-      this.unloadTmpl(selectedTemplate?.previousValue)
-    }
-    if (selectedTemplate && selectedTemplate.currentValue !== selectedTemplate.previousValue) {
-      this.loadTmpl(selectedTemplate.currentValue, selectedParcellation.currentValue)
-    } else if (selectedParcellation && selectedParcellation.currentValue !== selectedParcellation.previousValue) {
+    if (selectedTemplate) {
+      if (selectedTemplate?.currentValue?.['@id'] !== selectedTemplate?.previousValue?.['@id']) {
+
+        if (selectedTemplate?.previousValue) {
+          this.unloadTmpl(selectedTemplate?.previousValue)
+        }
+        if (selectedTemplate?.currentValue?.['@id']) {
+          this.loadTmpl(selectedTemplate.currentValue, selectedParcellation.currentValue)
+        }
+      }
+    }else if (selectedParcellation && selectedParcellation.currentValue !== selectedParcellation.previousValue) {
       this.loadParc(selectedParcellation.currentValue)
     }
   }