diff --git a/packages/basic.gblib/services/KeywordsExpressions.ts b/packages/basic.gblib/services/KeywordsExpressions.ts
index 88c5f736..0a31e111 100644
--- a/packages/basic.gblib/services/KeywordsExpressions.ts
+++ b/packages/basic.gblib/services/KeywordsExpressions.ts
@@ -1309,7 +1309,7 @@ export class KeywordsExpressions {
     ];
 
     keywords[i++] = [
-      /^\s*refresh\s*(.*)/gim,
+      /^\s*(refresh)\s*(.*)/gim,
       ($0, $1, $2, $3) => {
         return `await sys.refreshDataSourceCache({pid: pid, connectionName: ${$2}})`;
       }
diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts
index a0fa5d84..e8a242eb 100644
--- a/packages/core.gbapp/services/GBMinService.ts
+++ b/packages/core.gbapp/services/GBMinService.ts
@@ -1044,10 +1044,9 @@ export class GBMinService {
 
       const sec = new SecService();
       let member = context.activity.recipient;
-      
-      
-      if (process.env.STORAGE_NAME){
-        member  = context.activity.from;
+
+      if (process.env.STORAGE_NAME || !member) {
+        member = context.activity.from;
       }
       let user = await sec.ensureUser(min, member.id, member.name, '', 'web', member.name, null);
       const userId = user.userId;
diff --git a/templates/talk-to-data.gbai/talk-to-data.gbdialog/notify-latest-orders.bas b/templates/talk-to-data.gbai/talk-to-data.gbdialog/notify-latest-orders.bas
index b897c129..2315ba62 100644
--- a/templates/talk-to-data.gbai/talk-to-data.gbdialog/notify-latest-orders.bas
+++ b/templates/talk-to-data.gbai/talk-to-data.gbdialog/notify-latest-orders.bas
@@ -4,4 +4,4 @@ REFRESH "llm"
 
 list = REWRITE "A list of latest 10 orders made."
 
-TALK TO admin 
\ No newline at end of file
+TALK TO admin
\ No newline at end of file