diff --git a/src/Microsoft.SqlTools.ServiceLayer/Hosting/ServiceHost.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/ServiceHost.cs
index 36875ab6..f217e0d3 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Hosting/ServiceHost.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Hosting/ServiceHost.cs
@@ -157,7 +157,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Hosting
                         CompletionProvider = new CompletionOptions
                         {
                             ResolveProvider = true,
-                            TriggerCharacters = new string[] { ".", "-", ":", "\\", "," }
+                            TriggerCharacters = new string[] { ".", "-", ":", "\\" }
                         },
                         SignatureHelpProvider = new SignatureHelpOptions
                         {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteHelper.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteHelper.cs
index 74aeccce..40d2b608 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteHelper.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/AutoCompleteHelper.cs
@@ -30,7 +30,7 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
 
         private static WorkspaceService<SqlToolsSettings> workspaceServiceInstance;
 
-        private static Regex ValidSqlNameRegex = new Regex(@"^[\p{L}_][\p{L}\p{N}@$#_]{0,127}$");
+        private static Regex ValidSqlNameRegex = new Regex(@"^[\p{L}_@][\p{L}\p{N}@$#_]{0,127}$");
 
         private static CompletionItem[] emptyCompletionList = new CompletionItem[0];
 
@@ -103,6 +103,7 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
             "end-exec",
             "exec",
             "execute",
+            "exists",
             "exit",
             "external",
             "fast_forward",
@@ -177,6 +178,7 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
             "nonclustered",
             "none",
             "norecompute",
+            "not",
             "now",
             "null",
             "numeric",
@@ -193,6 +195,7 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
             "or",
             "order",
             "out",
+            "outer",
             "output",
             "over",
             "owner",