diff --git a/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts b/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts
index 18e5351b3..c1ade264c 100644
--- a/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts
+++ b/projects/aca-shared/src/lib/components/info-drawer/info-drawer.component.ts
@@ -40,6 +40,7 @@ import { Subject } from 'rxjs';
 export class InfoDrawerComponent implements OnChanges, OnInit, OnDestroy {
   @Input()
   nodeId: string;
+
   @Input()
   node: MinimalNodeEntity;
 
diff --git a/src/app/components/create-menu/create-menu.component.ts b/src/app/components/create-menu/create-menu.component.ts
index c2f6e9286..c03838111 100644
--- a/src/app/components/create-menu/create-menu.component.ts
+++ b/src/app/components/create-menu/create-menu.component.ts
@@ -25,7 +25,7 @@
 
 import { Component, Input, OnInit, OnDestroy, ViewEncapsulation } from '@angular/core';
 import { ContentActionRef } from '@alfresco/adf-extensions';
-import { AppStore, getCurrentFolder } from '@alfresco/aca-shared/store';
+import { AppStore, getRuleContext } from '@alfresco/aca-shared/store';
 import { Store } from '@ngrx/store';
 import { takeUntil } from 'rxjs/operators';
 import { Subject } from 'rxjs';
@@ -52,7 +52,7 @@ export class CreateMenuComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.store
-      .select(getCurrentFolder)
+      .select(getRuleContext)
       .pipe(takeUntil(this.onDestroy$))
       .subscribe(() => {
         this.createActions = this.extensions.getCreateActions();
diff --git a/src/app/components/viewer/viewer.component.ts b/src/app/components/viewer/viewer.component.ts
index de51eafa5..9782e22f3 100644
--- a/src/app/components/viewer/viewer.component.ts
+++ b/src/app/components/viewer/viewer.component.ts
@@ -26,7 +26,7 @@
 import { AppExtensionService, ContentApiService } from '@alfresco/aca-shared';
 import {
   AppStore,
-  getAppSelection,
+  getRuleContext,
   isInfoDrawerOpened,
   SetSelectedNodesAction,
   ClosePreviewAction,
@@ -125,10 +125,10 @@ export class AppViewerComponent implements OnInit, OnDestroy {
       });
 
     this.store
-      .select(getAppSelection)
+      .select(getRuleContext)
       .pipe(takeUntil(this.onDestroy$))
-      .subscribe((selection) => {
-        this.selection = selection;
+      .subscribe((ruleContext) => {
+        this.selection = ruleContext.selection;
 
         this.toolbarActions = this.extensions.getViewerToolbarActions();
         this.openWith = this.extensions.openWithActions;