diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 93573c9..78803d0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,14 +12,14 @@ jobs:
         node-version: [14.x, 16.x, 18.x]
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v2
       with:
         node-version: ${{ matrix.node-version }}
     - name: npm test
       run: |
-        npm i
+        npm ci
         npx @themost/peers
         npm test
       env:
diff --git a/OnNestedQueryListener.js b/OnNestedQueryListener.js
index 627b057..06f516a 100644
--- a/OnNestedQueryListener.js
+++ b/OnNestedQueryListener.js
@@ -56,16 +56,15 @@ class OnNestedQueryListener {
             return Promise.resolve();
         }
         if (Object.prototype.hasOwnProperty.call(query, '$expand')) {
-            /**
-             * @type {{ $entity:{ model:string }} | Array<{ $entity:{ model:string }}>}
-             */
-            const expand = query.$expand;
             // exit if expand is null or undefined
-            if (expand == null) {
+            if (query.$expand == null) {
                 return Promise.resolve();
             }
-            if (Array.isArray(expand)) {
-
+            /**
+             * @type {Array<{ $entity:{ model:string }}>}
+             */
+            const expand = Array.isArray(query.$expand) ? query.$expand : [query.$expand];
+            if (expand.length) {
                 const sources = expand.map(function (item) {
                     return function () {
                         // if entity is already a query expression
@@ -158,13 +157,6 @@ class OnNestedQueryListener {
                     }
                 });
                 return Promise.sequence(sources);
-            } else if (expand && expand.$entity && expand.$entity.model) {
-                // get nested model
-                const model = context.model(expand.$entity.model);
-                if (model != null) {
-                    //
-                    return Promise.resolve();
-                }
             }
         }
         return Promise.resolve();
diff --git a/package-lock.json b/package-lock.json
index 4852a6f..b660297 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@themost/data",
-  "version": "2.11.1",
+  "version": "2.11.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0c850b7..0ed9f1c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@themost/data",
-  "version": "2.11.1",
+  "version": "2.11.2",
   "description": "MOST Web Framework Codename Blueshift - Data module",
   "main": "index.js",
   "scripts": {