diff --git a/client/app/components/queries/QueryEditor/ace.js b/client/app/components/queries/QueryEditor/ace.js
index 1579988ec1..67cb550692 100644
--- a/client/app/components/queries/QueryEditor/ace.js
+++ b/client/app/components/queries/QueryEditor/ace.js
@@ -1,14 +1,14 @@
 import { isNil, map } from "lodash";
 import AceEditor from "react-ace";
-import ace from "brace";
+import ace from "ace-builds";
 
-import "brace/ext/language_tools";
-import "brace/mode/json";
-import "brace/mode/python";
-import "brace/mode/sql";
-import "brace/mode/yaml";
-import "brace/theme/textmate";
-import "brace/ext/searchbox";
+import "ace-builds/src-noconflict/ext-language_tools";
+import "ace-builds/src-noconflict/mode-json";
+import "ace-builds/src-noconflict/mode-python";
+import "ace-builds/src-noconflict/mode-sql";
+import "ace-builds/src-noconflict/mode-yaml";
+import "ace-builds/src-noconflict/theme-textmate";
+import "ace-builds/src-noconflict/ext-searchbox";
 
 const langTools = ace.acequire("ace/ext/language_tools");
 const snippetsModule = ace.acequire("ace/snippets");
@@ -31,12 +31,10 @@ function buildTableColumnKeywords(table) {
   const keywords = [];
   table.columns.forEach(column => {
     keywords.push({
-      caption: column.name,
       name: `${table.name}.${column.name}`,
       value: `${table.name}.${column.name}`,
       score: 100,
       meta: "Column",
-      className: "completion",
     });
   });
   return keywords;
diff --git a/package-lock.json b/package-lock.json
index 45566abcc0..fbb74d5513 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1516,6 +1516,11 @@
         "negotiator": "0.6.1"
       }
     },
+    "ace-builds": {
+      "version": "1.4.12",
+      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.12.tgz",
+      "integrity": "sha512-G+chJctFPiiLGvs3+/Mly3apXTcfgE45dT5yp12BcWZ1kUs+gm0qd3/fv4gsz6fVag4mM0moHVpjHDIgph6Psg=="
+    },
     "acorn": {
       "version": "5.7.3",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
@@ -2678,11 +2683,6 @@
         "typedarray-pool": "^1.1.0"
       }
     },
-    "brace": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/brace/-/brace-0.11.1.tgz",
-      "integrity": "sha1-SJb8ydVE7vRfS7dmDbMg07N5/lg="
-    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -4571,9 +4571,9 @@
       "dev": true
     },
     "diff-match-patch": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.4.tgz",
-      "integrity": "sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg=="
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz",
+      "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="
     },
     "diff-sequences": {
       "version": "24.0.0",
@@ -10356,7 +10356,7 @@
     "lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
+      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="
     },
     "lodash.isequal": {
       "version": "4.5.0",
@@ -13701,15 +13701,15 @@
       }
     },
     "react-ace": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-6.4.0.tgz",
-      "integrity": "sha512-woTTgGk9x4GRRWiM4QLNOspjaJAYLX3UZ3J2XRYQvJiN6wyxrFY9x7rdOKc+4Tj+khb/ccPiDj/kll4UeJEDPw==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-9.1.1.tgz",
+      "integrity": "sha512-dL0w6GwtnS1opsOoWhJaF7rF7xCM+NOEOfePmDfiaeU+EyZQ6nRWDBgyzKsuiB3hyXH3G9D6FX37ur/LKUdKjA==",
       "requires": {
-        "brace": "^0.11.1",
+        "ace-builds": "^1.4.6",
         "diff-match-patch": "^1.0.4",
         "lodash.get": "^4.4.2",
         "lodash.isequal": "^4.5.0",
-        "prop-types": "^15.6.2"
+        "prop-types": "^15.7.2"
       }
     },
     "react-dom": {
diff --git a/package.json b/package.json
index 9952a28789..8b21b08ad7 100644
--- a/package.json
+++ b/package.json
@@ -46,10 +46,10 @@
     "@types/prop-types": "^15.5.2",
     "@types/react": "^16.3.13",
     "@types/react-dom": "^16.0.5",
+    "ace-builds": "1.4.12",
     "antd": "^3.26.17",
     "axios": "^0.19.0",
     "bootstrap": "^3.3.7",
-    "brace": "^0.11.0",
     "classnames": "^2.2.6",
     "d3": "^3.5.17",
     "debug": "^3.1.0",
@@ -68,7 +68,7 @@
     "prop-types": "^15.6.1",
     "query-string": "^6.9.0",
     "react": "^16.8.3",
-    "react-ace": "^6.1.0",
+    "react-ace": "9.1.1",
     "react-dom": "^16.8.3",
     "react-grid-layout": "^0.18.2",
     "react-resizable": "^1.10.1",