diff --git a/packages/web/src/sqleditor/analyseQuerySources.js b/packages/web/src/sqleditor/analyseQuerySources.js
index 4613d8198..0c99aa628 100644
--- a/packages/web/src/sqleditor/analyseQuerySources.js
+++ b/packages/web/src/sqleditor/analyseQuerySources.js
@@ -9,7 +9,7 @@ export default function analyseQuerySources(sql, sourceNames) {
       const wordUpper = word.toUpperCase();
       if (upperSourceNames.includes(wordUpper)) {
         const preWord = tokens[i - 1];
-        if (preWord && /^(join)|(from)|(update)|(delete)|(insert)$/i.test(preWord)) {
+        if (preWord && /^((join)|(from)|(update)|(delete)|(insert))$/i.test(preWord)) {
           let postWord = tokens[i + 1];
           if (postWord && /^as$/i.test(postWord)) {
             postWord = tokens[i + 2];
@@ -18,7 +18,10 @@ export default function analyseQuerySources(sql, sourceNames) {
             res.push({
               name: word,
             });
-          } else if (/^(where)|(inner)|(left)|(right)|(on)|(join)$/i.test(postWord)) {
+          } else if (
+            /^((where)|(inner)|(left)|(right)|(on)|(join))$/i.test(postWord) ||
+            !/^[a-zA-Z][a-zA-Z0-9]*$/i.test(postWord)
+          ) {
             res.push({
               name: word,
             });
diff --git a/packages/web/src/sqleditor/useCodeCompletion.js b/packages/web/src/sqleditor/useCodeCompletion.js
index 7d631acc7..fb4a1b668 100644
--- a/packages/web/src/sqleditor/useCodeCompletion.js
+++ b/packages/web/src/sqleditor/useCodeCompletion.js
@@ -111,11 +111,9 @@ export default function useCodeCompletion({ conid, database, tabVisible, current
           editor.execCommand('startAutocomplete');
         }
 
-        // if (e.args == ' ' || e.args == '.') {
-        //   if (/from\s*$/i.test(line)) {
-        //     currentEditorRef.current.editor.execCommand('startAutocomplete');
-        //   }
-        // }
+        if (e.args == ' '  && /((from)|(join))\s*$/i.test(line)) {
+          editor.execCommand('startAutocomplete');
+        }
       }
     };