diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 00000000..e402cbb0
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,19 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558 
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "type": "typescript",
+            "tsconfig": "tsconfig.json",
+            "option": "watch",
+            "problemMatcher": [
+                "$tsc-watch"
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/packages/analytics.gblib/models/index.ts b/packages/analytics.gblib/models/index.ts
index f0f494f3..6d0fc6e5 100644
--- a/packages/analytics.gblib/models/index.ts
+++ b/packages/analytics.gblib/models/index.ts
@@ -36,7 +36,6 @@
 
 'use strict';
 
-
 import {
   AutoIncrement,
   BelongsTo,
diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
index 383af961..fe436d54 100644
--- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
+++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
@@ -486,7 +486,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
         } catch (error) {
           reject(error);
         }
-      }, 20000);
+      }, 60000);
     });
   }
 
diff --git a/packages/core.gbapp/services/GBConversationalService.ts b/packages/core.gbapp/services/GBConversationalService.ts
index 68024e3c..b3bf8ec7 100644
--- a/packages/core.gbapp/services/GBConversationalService.ts
+++ b/packages/core.gbapp/services/GBConversationalService.ts
@@ -141,7 +141,7 @@ export class GBConversationalService implements IGBConversationalService {
       GBLog.info(`NLP called: ${intent} ${firstEntity}`);
 
       try {
-        await step.replaceDialog(` /${intent}`, nlp.entities);
+        await step.replaceDialog(`/${intent}`, nlp.entities);
 
         return Promise.resolve(true);
       } catch (error) {
diff --git a/packages/default.gbui/package-lock.json b/packages/default.gbui/package-lock.json
index d0ae7270..9d8cff94 100644
--- a/packages/default.gbui/package-lock.json
+++ b/packages/default.gbui/package-lock.json
@@ -5719,7 +5719,8 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -6084,7 +6085,8 @@
         },
         "safe-buffer": {
           "version": "5.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -6132,6 +6134,7 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -6170,11 +6173,13 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         }
       }
     },
diff --git a/packages/kb.gbapp/services/KBService.ts b/packages/kb.gbapp/services/KBService.ts
index 11029b48..87a4de37 100644
--- a/packages/kb.gbapp/services/KBService.ts
+++ b/packages/kb.gbapp/services/KBService.ts
@@ -86,6 +86,7 @@ export class KBService {
 
   public static getSubjectItemsSeparatedBySpaces(subjects: GuaribasSubject[]) {
     const out = [];
+    if (subjects === undefined) { return ''; }
     subjects.forEach(subject => {
       out.push(subject.internalId);
     });
@@ -168,7 +169,7 @@ export class KBService {
         query = `${query} ${text}`;
       }
     }
-    query = `${query}&$filter=instanceId eq ${instance.instanceId}`;
+    // TODO: query = `${query}&$filter=instanceId eq ${instance.instanceId}`;
 
     // tslint:disable:no-unsafe-any
     if (instance.searchKey !== null && GBConfigService.get('STORAGE_DIALECT') === 'mssql') {
diff --git a/packages/security.gblib/models/index.ts b/packages/security.gblib/models/index.ts
index 215be291..2cb49ce8 100644
--- a/packages/security.gblib/models/index.ts
+++ b/packages/security.gblib/models/index.ts
@@ -36,7 +36,6 @@
 
 'use strict';
 
-
 import {
   AutoIncrement,
   BelongsTo,