diff --git a/package-lock.json b/package-lock.json
index fe803fe7cb9..f1ef3e0e162 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1054,6 +1054,11 @@
         }
       }
     },
+    "@mongodb-js/triejs": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@mongodb-js/triejs/-/triejs-0.1.5.tgz",
+      "integrity": "sha512-elh8S1OxmEGe8/wbr6ky//dHhV2ld6oZV8/M9lgozJsL/6Aqm8j5+ElquzoX9k9l3Q+dohuX/SIGR/kTRZHS4g=="
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
@@ -14814,9 +14819,9 @@
       }
     },
     "mongodb": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.2.tgz",
-      "integrity": "sha512-Lxt4th2tK2MxmkDBR5cMik+xEnkvhwg0BC5kGcHm9RBwaNEsrIryvV5istGXOHbnif5KslMpY1FbX6YbGJ/Trg==",
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.4.tgz",
+      "integrity": "sha512-xGH41Ig4dkSH5ROGezkgDbsgt/v5zbNUwE3TcFsSbDc6Qn3Qil17dhLsESSDDPTiyFDCPJRpfd4887dtsPgKtA==",
       "requires": {
         "bl": "^2.2.0",
         "bson": "^1.1.1",
@@ -14993,6 +14998,7 @@
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/mongodb-collection-sample/-/mongodb-collection-sample-4.5.0.tgz",
       "integrity": "sha512-cqF3io9jFetT35dq46fkfUHv+ZpxXMi75Tks9axM8uQJ24024TFDLT0pID6oKnS7643vPznewnm1CYt/l/UFmw==",
+      "optional": true,
       "requires": {
         "bson": "^4.0.3",
         "debug": "^4.1.1",
@@ -15045,6 +15051,7 @@
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "optional": true,
           "requires": {
             "ms": "^2.1.1"
           }
@@ -15083,7 +15090,8 @@
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "optional": true
         },
         "p-locate": {
           "version": "4.1.0",
@@ -15103,7 +15111,8 @@
         "semver": {
           "version": "7.1.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.1.tgz",
-          "integrity": "sha512-WfuG+fl6eh3eZ2qAf6goB7nhiCd7NPXhmyFxigB/TOkQyeLP8w8GsVehvtGNtnNmyboz4TgeK40B1Kbql/8c5A=="
+          "integrity": "sha512-WfuG+fl6eh3eZ2qAf6goB7nhiCd7NPXhmyFxigB/TOkQyeLP8w8GsVehvtGNtnNmyboz4TgeK40B1Kbql/8c5A==",
+          "optional": true
         },
         "string-width": {
           "version": "4.2.0",
@@ -15262,27 +15271,43 @@
       }
     },
     "mongodb-data-service": {
-      "version": "16.5.5",
-      "resolved": "https://registry.npmjs.org/mongodb-data-service/-/mongodb-data-service-16.5.5.tgz",
-      "integrity": "sha512-Y3XgagtjFvSqdAMujqG3jrXzBQS7DKsXNd7XR4jJLbiJKOoP/cD12DgTan6VFy43d+DzP/KF8cTv20YBbUwa7w==",
+      "version": "16.5.6",
+      "resolved": "https://registry.npmjs.org/mongodb-data-service/-/mongodb-data-service-16.5.6.tgz",
+      "integrity": "sha512-cjJ1rd8iY84Cv3hbb2gAR6RcEk56vQ+/j2cBHTOVW+pNPbN+deQ8Ebq1NkV4gj1KPjD0OIuDMqlKek/zfpMQtQ==",
       "requires": {
-        "async": "^3.1.0",
+        "async": "^3.2.0",
         "debug": "^4.1.1",
-        "lodash": "^4.17.0",
-        "mongodb": "^3.5.2",
-        "mongodb-collection-sample": "^4.4.4",
+        "lodash": "^4.17.15",
+        "mongodb": "^3.5.4",
+        "mongodb-collection-sample": "^4.5.1",
         "mongodb-connection-model": "^14.6.2",
-        "mongodb-index-model": "^2.5.0",
+        "mongodb-index-model": "^2.6.0",
         "mongodb-js-errors": "^0.5.0",
-        "mongodb-ns": "^2.0.0",
+        "mongodb-ns": "^2.2.0",
         "mongodb-security": "^0.2.0",
         "mongodb-url": "^3.0.3"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "optional": true
+        },
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "optional": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
         "async": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/async/-/async-3.1.1.tgz",
-          "integrity": "sha512-X5Dj8hK1pJNC2Wzo2Rcp9FBVdJMGRR/S7V+lH46s8GVFhtbo5O4Le5GECCF/8PISVdkUA6mMPvgz7qTTD1rf1g=="
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
+          "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="
         },
         "boom": {
           "version": "7.3.0",
@@ -15292,16 +15317,83 @@
             "hoek": "6.x.x"
           }
         },
+        "cliui": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+          "optional": true,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^6.2.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "optional": true
+        },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "optional": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
         "hoek": {
           "version": "6.1.3",
           "resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.3.tgz",
           "integrity": "sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ=="
         },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "optional": true
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "optional": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
         "lodash": {
           "version": "4.17.15",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
           "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
         },
+        "mongodb-collection-sample": {
+          "version": "4.5.1",
+          "resolved": "https://registry.npmjs.org/mongodb-collection-sample/-/mongodb-collection-sample-4.5.1.tgz",
+          "integrity": "sha512-tUCdRLToheOh2Tn+KVdhYtbLifxCo60+wVMf0zxtbZLKPYbZqQaYmyrYTsEunePNJyxIutBWdayX79VJ/Fb2hg==",
+          "requires": {
+            "bson": "^4.0.3",
+            "debug": "^4.1.1",
+            "event-stream": "^4.0.1",
+            "lodash.chunk": "^4.2.0",
+            "lodash.defaults": "^4.2.0",
+            "mongodb-ns": "^2.2.0",
+            "reservoir": "^0.1.2",
+            "semver": "^5.7.1",
+            "yargs": "^15.1.0"
+          }
+        },
         "mongodb-js-errors": {
           "version": "0.5.0",
           "resolved": "https://registry.npmjs.org/mongodb-js-errors/-/mongodb-js-errors-0.5.0.tgz",
@@ -15310,6 +15402,81 @@
             "boom": "^7.3.0",
             "debug": "^4.1.1"
           }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "optional": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "optional": true
+        },
+        "string-width": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "optional": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "optional": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "yargs": {
+          "version": "15.1.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz",
+          "integrity": "sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==",
+          "optional": true,
+          "requires": {
+            "cliui": "^6.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^4.1.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^4.2.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^16.1.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "16.1.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz",
+          "integrity": "sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==",
+          "optional": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
         }
       }
     },
@@ -15472,21 +15639,26 @@
       }
     },
     "mongodb-index-model": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/mongodb-index-model/-/mongodb-index-model-2.5.0.tgz",
-      "integrity": "sha512-1EEDG7M2NDIiogPWbCCUCDfoBSjX7r9XyHyusakzCYe69ciaTdkS29hh/By/2F5R7gfHr84IVxN4WKjg8k9BGA==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mongodb-index-model/-/mongodb-index-model-2.6.0.tgz",
+      "integrity": "sha512-CS1kgCxLoya1ywgE85zHuvxQEo7cj934OZI4baNdahfWxo0L9CXzCVGZQdUcOW1r6y2dYk3heN8f5/d8rPYCWA==",
       "requires": {
+        "@mongodb-js/triejs": "^0.1.5",
         "ampersand-collection": "^1.6.1",
         "ampersand-model": "^6.0.2",
         "ampersand-rest-collection": "^5.0.0",
-        "async": "^1.5.2",
-        "lodash": "^4.8.2",
-        "mongodb": "^3.1.9",
-        "mongodb-js-errors": "^0.4.0",
-        "mongodb-ns": "^2.0.0",
-        "triejs": "github:rueckstiess/triejs"
+        "async": "^3.2.0",
+        "lodash": "^4.17.15",
+        "mongodb": "^3.5.4",
+        "mongodb-js-errors": "^0.5.0",
+        "mongodb-ns": "^2.2.0"
       },
       "dependencies": {
+        "async": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
+          "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="
+        },
         "boom": {
           "version": "7.3.0",
           "resolved": "https://registry.npmjs.org/boom/-/boom-7.3.0.tgz",
@@ -15495,14 +15667,6 @@
             "hoek": "6.x.x"
           }
         },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
         "hoek": {
           "version": "6.1.3",
           "resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.3.tgz",
@@ -15514,18 +15678,13 @@
           "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
         },
         "mongodb-js-errors": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/mongodb-js-errors/-/mongodb-js-errors-0.4.0.tgz",
-          "integrity": "sha512-RBPBjps/BAB/uw1ENHcedj+bizVcIrEcjjA1+MqXWdT0px7AWD8rcjFui4cx3/8xPUSaP5zSZf16hb78pzVu7Q==",
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/mongodb-js-errors/-/mongodb-js-errors-0.5.0.tgz",
+          "integrity": "sha512-Oi5SEvC+9q0l9JL3STQFrykKYwMygcrspGHpVcMG0dX/sIKFsiso+g9gYcm1uf3Aj1BmLRYiW6GchvUbxVkvhQ==",
           "requires": {
             "boom": "^7.3.0",
             "debug": "^4.1.1"
           }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         }
       }
     },
diff --git a/package.json b/package.json
index b48006350ef..b4c4121d791 100644
--- a/package.json
+++ b/package.json
@@ -364,18 +364,18 @@
     "lodash": "^3.10.1",
     "marky": "^1.2.0",
     "moment": "^2.10.6",
-    "mongodb": "^3.5.2",
+    "mongodb": "^3.5.4",
     "mongodb-ace-autocompleter": "^0.4.1",
     "mongodb-ace-mode": "^0.4.1",
     "mongodb-ace-theme": "^0.0.1",
     "mongodb-ace-theme-query": "^0.0.2",
     "mongodb-collection-model": "^3.1.0",
     "mongodb-connection-model": "^14.6.2",
-    "mongodb-data-service": "^16.5.5",
+    "mongodb-data-service": "^16.5.6",
     "mongodb-database-model": "^0.1.3",
     "mongodb-explain-plan-model": "^0.2.3",
     "mongodb-extended-json": "^1.11.0",
-    "mongodb-index-model": "^2.5.0",
+    "mongodb-index-model": "^2.6.0",
     "mongodb-instance-model": "^10.0.0",
     "mongodb-js-metrics": "^5.0.1",
     "mongodb-language-model": "^1.6.1",