diff --git a/.eslintignore b/.eslintignore
index 28aee9220..4cd3a6d76 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -253,11 +253,8 @@ src/Terminal/NotebookAppContracts.d.ts
 src/Terminal/index.ts
 src/TokenProviders/PortalTokenProvider.ts
 src/TokenProviders/TokenProviderFactory.ts
-src/Utils/DatabaseAccountUtils.test.ts
-src/Utils/DatabaseAccountUtils.ts
 src/Utils/PricingUtils.test.ts
 src/Utils/QueryUtils.test.ts
-src/Utils/QueryUtils.ts
 src/applyExplorerBindings.ts
 src/global.d.ts
 src/setupTests.ts
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..60fa0ee1a
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,9 @@
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/package-lock.json b/package-lock.json
index 81ae0372c..c9a26f2d5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26668,10 +26668,6 @@
         "@types/yargs": "^13.0.0"
       }
     },
-    "@jonkemp/package-utils": {
-      "version": "1.0.7",
-      "dev": true
-    },
     "@jupyterlab/apputils": {
       "version": "3.0.2",
       "requires": {
@@ -27850,24 +27846,6 @@
     "@opentelemetry/context-base": {
       "version": "0.10.2"
     },
-    "@peculiar/asn1-schema": {
-      "version": "1.1.2",
-      "requires": {
-        "asn1js": "^2.0.26",
-        "tslib": "^1.11.1"
-      }
-    },
-    "@peculiar/json-schema": {
-      "version": "1.1.12",
-      "requires": {
-        "tslib": "^2.0.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.1.0"
-        }
-      }
-    },
     "@phosphor/algorithm": {
       "version": "1.2.0"
     },
@@ -28126,10 +28104,6 @@
         "@testing-library/dom": "^7.28.1"
       }
     },
-    "@tootallnate/once": {
-      "version": "1.1.2",
-      "dev": true
-    },
     "@types/anymatch": {
       "version": "1.3.1",
       "dev": true
@@ -28145,9 +28119,6 @@
     "@types/asap": {
       "version": "2.0.0"
     },
-    "@types/asn1js": {
-      "version": "2.0.0"
-    },
     "@types/babel__core": {
       "version": "7.1.12",
       "requires": {
@@ -28598,7 +28569,9 @@
       }
     },
     "@types/node": {
-      "version": "12.11.1"
+      "version": "12.11.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.11.1.tgz",
+      "integrity": "sha512-TJtwsqZ39pqcljJpajeoofYRfeZ7/I/OMUQ5pR4q5wOKf2ocrUvBAZUMhWsOvKx3dVc/aaV5GluBivt0sWqA5A=="
     },
     "@types/node-fetch": {
       "version": "2.5.7",
@@ -28737,10 +28710,6 @@
         "@types/jest": "*"
       }
     },
-    "@types/text-encoding": {
-      "version": "0.0.33",
-      "dev": true
-    },
     "@types/tunnel": {
       "version": "0.0.1",
       "requires": {
@@ -28775,10 +28744,6 @@
     "@types/uuid": {
       "version": "8.3.0"
     },
-    "@types/webfontloader": {
-      "version": "1.6.29",
-      "dev": true
-    },
     "@types/webpack": {
       "version": "4.41.26",
       "dev": true,
@@ -29619,9 +29584,6 @@
     "asap": {
       "version": "2.0.6"
     },
-    "asmcrypto.js": {
-      "version": "2.3.2"
-    },
     "asn1": {
       "version": "0.2.4",
       "requires": {
@@ -29637,12 +29599,6 @@
         "safer-buffer": "^2.1.0"
       }
     },
-    "asn1js": {
-      "version": "2.0.26",
-      "requires": {
-        "pvutils": "latest"
-      }
-    },
     "assert": {
       "version": "1.5.0",
       "requires": {
@@ -29847,24 +29803,6 @@
     "babel-plugin-syntax-jsx": {
       "version": "6.18.0"
     },
-    "babel-polyfill": {
-      "version": "6.26.0",
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "core-js": "^2.5.0",
-        "regenerator-runtime": "^0.10.5"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.6.12",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
-        },
-        "regenerator-runtime": {
-          "version": "0.10.5"
-        }
-      }
-    },
     "babel-preset-current-node-syntax": {
       "version": "0.1.4",
       "requires": {
@@ -30038,7 +29976,10 @@
       "version": "3.7.2"
     },
     "bn.js": {
-      "version": "4.11.9"
+      "version": "4.11.9",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+      "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+      "dev": true
     },
     "body-parser": {
       "version": "1.19.0",
@@ -30154,7 +30095,10 @@
       }
     },
     "brorand": {
-      "version": "1.1.0"
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
     },
     "browser-process-hrtime": {
       "version": "1.0.0"
@@ -30847,10 +30791,6 @@
       "version": "1.0.6",
       "dev": true
     },
-    "cookiejar": {
-      "version": "2.1.2",
-      "dev": true
-    },
     "copy-concurrently": {
       "version": "1.0.5",
       "requires": {
@@ -31087,19 +31027,6 @@
         }
       }
     },
-    "css-rules": {
-      "version": "1.0.9",
-      "dev": true,
-      "requires": {
-        "cssom": "^0.4.4"
-      },
-      "dependencies": {
-        "cssom": {
-          "version": "0.4.4",
-          "dev": true
-        }
-      }
-    },
     "css-select": {
       "version": "3.1.2",
       "dev": true,
@@ -31470,10 +31397,6 @@
         "assert-plus": "^1.0.0"
       }
     },
-    "data-uri-to-buffer": {
-      "version": "3.0.1",
-      "dev": true
-    },
     "data-urls": {
       "version": "1.1.0",
       "requires": {
@@ -31642,28 +31565,6 @@
         }
       }
     },
-    "degenerator": {
-      "version": "2.2.0",
-      "dev": true,
-      "requires": {
-        "ast-types": "^0.13.2",
-        "escodegen": "^1.8.1",
-        "esprima": "^4.0.0"
-      },
-      "dependencies": {
-        "ast-types": {
-          "version": "0.13.4",
-          "dev": true,
-          "requires": {
-            "tslib": "^2.0.1"
-          }
-        },
-        "tslib": {
-          "version": "2.1.0",
-          "dev": true
-        }
-      }
-    },
     "del": {
       "version": "4.1.1",
       "dev": true,
@@ -31744,6 +31645,9 @@
     },
     "des.js": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "dev": true,
       "requires": {
         "inherits": "^2.0.1",
         "minimalistic-assert": "^1.0.0"
@@ -31972,6 +31876,9 @@
     },
     "elliptic": {
       "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
+      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+      "dev": true,
       "requires": {
         "bn.js": "^4.4.0",
         "brorand": "^1.0.1",
@@ -32166,9 +32073,6 @@
         "es6-symbol": "^3.1.1"
       }
     },
-    "es6-object-assign": {
-      "version": "1.1.0"
-    },
     "es6-symbol": {
       "version": "3.1.3",
       "requires": {
@@ -32753,16 +32657,6 @@
         }
       }
     },
-    "extract-css": {
-      "version": "1.5.5",
-      "dev": true,
-      "requires": {
-        "batch": "^0.6.1",
-        "href-content": "^1.2.3",
-        "list-stylesheets": "^1.2.8",
-        "style-data": "^1.4.6"
-      }
-    },
     "extract-zip": {
       "version": "2.0.1",
       "dev": true,
@@ -32847,10 +32741,6 @@
     "fast-memoize": {
       "version": "2.5.2"
     },
-    "fast-safe-stringify": {
-      "version": "2.0.7",
-      "dev": true
-    },
     "fastparse": {
       "version": "1.1.2",
       "dev": true
@@ -32918,10 +32808,6 @@
     "file-saver": {
       "version": "2.0.5"
     },
-    "file-uri-to-path": {
-      "version": "2.0.0",
-      "dev": true
-    },
     "filesize": {
       "version": "3.6.1",
       "dev": true
@@ -33175,10 +33061,6 @@
     "flatted": {
       "version": "2.0.2"
     },
-    "flatten": {
-      "version": "1.0.3",
-      "dev": true
-    },
     "flush-write-stream": {
       "version": "1.1.1",
       "requires": {
@@ -33239,10 +33121,6 @@
         "samsam": "1.x"
       }
     },
-    "formidable": {
-      "version": "1.2.2",
-      "dev": true
-    },
     "forwarded": {
       "version": "0.1.2",
       "dev": true
@@ -33325,38 +33203,6 @@
         "nan": "^2.12.1"
       }
     },
-    "ftp": {
-      "version": "0.3.10",
-      "dev": true,
-      "requires": {
-        "readable-stream": "1.1.x",
-        "xregexp": "2.0.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "dev": true
-        },
-        "xregexp": {
-          "version": "2.0.0",
-          "dev": true
-        }
-      }
-    },
     "function-bind": {
       "version": "1.1.1"
     },
@@ -33414,29 +33260,6 @@
         "pump": "^3.0.0"
       }
     },
-    "get-uri": {
-      "version": "3.0.2",
-      "dev": true,
-      "requires": {
-        "@tootallnate/once": "1",
-        "data-uri-to-buffer": "3",
-        "debug": "4",
-        "file-uri-to-path": "2",
-        "fs-extra": "^8.1.0",
-        "ftp": "^0.3.10"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "8.1.0",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        }
-      }
-    },
     "get-value": {
       "version": "2.0.6"
     },
@@ -33774,6 +33597,9 @@
     },
     "hash.js": {
       "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
       "requires": {
         "inherits": "^2.0.3",
         "minimalistic-assert": "^1.0.1"
@@ -33806,6 +33632,9 @@
     },
     "hmac-drbg": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
       "requires": {
         "hash.js": "^1.0.3",
         "minimalistic-assert": "^1.0.0",
@@ -33841,13 +33670,6 @@
         "wbuf": "^1.1.0"
       }
     },
-    "href-content": {
-      "version": "1.2.3",
-      "dev": true,
-      "requires": {
-        "remote-content": "^1.2.3"
-      }
-    },
     "html-element-map": {
       "version": "1.3.0",
       "dev": true,
@@ -34016,15 +33838,6 @@
         "requires-port": "^1.0.0"
       }
     },
-    "http-proxy-agent": {
-      "version": "4.0.1",
-      "dev": true,
-      "requires": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4"
-      }
-    },
     "http-proxy-middleware": {
       "version": "0.19.1",
       "dev": true,
@@ -34165,118 +33978,6 @@
     "ini": {
       "version": "1.3.8"
     },
-    "inline-css": {
-      "version": "2.2.5",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.5.1",
-        "cheerio": "0.22.0",
-        "css-rules": "^1.0.0",
-        "extend": "^3.0.0",
-        "extract-css": "^1.0.0",
-        "flatten": "^1.0.2",
-        "object.pick": "^1.1.1",
-        "slick": "^1.12.1",
-        "specificity": "^0.3.2"
-      },
-      "dependencies": {
-        "cheerio": {
-          "version": "0.22.0",
-          "dev": true,
-          "requires": {
-            "css-select": "~1.2.0",
-            "dom-serializer": "~0.1.0",
-            "entities": "~1.1.1",
-            "htmlparser2": "^3.9.1",
-            "lodash.assignin": "^4.0.9",
-            "lodash.bind": "^4.1.4",
-            "lodash.defaults": "^4.0.1",
-            "lodash.filter": "^4.4.0",
-            "lodash.flatten": "^4.2.0",
-            "lodash.foreach": "^4.3.0",
-            "lodash.map": "^4.4.0",
-            "lodash.merge": "^4.4.0",
-            "lodash.pick": "^4.2.1",
-            "lodash.reduce": "^4.4.0",
-            "lodash.reject": "^4.4.0",
-            "lodash.some": "^4.4.0"
-          }
-        },
-        "css-select": {
-          "version": "1.2.0",
-          "dev": true,
-          "requires": {
-            "boolbase": "~1.0.0",
-            "css-what": "2.1",
-            "domutils": "1.5.1",
-            "nth-check": "~1.0.1"
-          }
-        },
-        "css-what": {
-          "version": "2.1.3",
-          "dev": true
-        },
-        "dom-serializer": {
-          "version": "0.1.1",
-          "dev": true,
-          "requires": {
-            "domelementtype": "^1.3.0",
-            "entities": "^1.1.1"
-          }
-        },
-        "domelementtype": {
-          "version": "1.3.1",
-          "dev": true
-        },
-        "domhandler": {
-          "version": "2.4.2",
-          "dev": true,
-          "requires": {
-            "domelementtype": "1"
-          }
-        },
-        "domutils": {
-          "version": "1.5.1",
-          "dev": true,
-          "requires": {
-            "dom-serializer": "0",
-            "domelementtype": "1"
-          }
-        },
-        "entities": {
-          "version": "1.1.2",
-          "dev": true
-        },
-        "htmlparser2": {
-          "version": "3.10.1",
-          "dev": true,
-          "requires": {
-            "domelementtype": "^1.3.1",
-            "domhandler": "^2.3.0",
-            "domutils": "^1.5.1",
-            "entities": "^1.1.1",
-            "inherits": "^2.0.1",
-            "readable-stream": "^3.1.1"
-          }
-        },
-        "nth-check": {
-          "version": "1.0.2",
-          "dev": true,
-          "requires": {
-            "boolbase": "~1.0.0"
-          }
-        },
-        "readable-stream": {
-          "version": "3.6.0",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
     "internal-ip": {
       "version": "4.3.0",
       "dev": true,
@@ -36498,113 +36199,10 @@
     "lines-and-columns": {
       "version": "1.1.6"
     },
-    "list-stylesheets": {
-      "version": "1.2.9",
-      "dev": true,
-      "requires": {
-        "cheerio": "^0.22.0",
-        "pick-util": "^1.1.3"
-      },
-      "dependencies": {
-        "cheerio": {
-          "version": "0.22.0",
-          "dev": true,
-          "requires": {
-            "css-select": "~1.2.0",
-            "dom-serializer": "~0.1.0",
-            "entities": "~1.1.1",
-            "htmlparser2": "^3.9.1",
-            "lodash.assignin": "^4.0.9",
-            "lodash.bind": "^4.1.4",
-            "lodash.defaults": "^4.0.1",
-            "lodash.filter": "^4.4.0",
-            "lodash.flatten": "^4.2.0",
-            "lodash.foreach": "^4.3.0",
-            "lodash.map": "^4.4.0",
-            "lodash.merge": "^4.4.0",
-            "lodash.pick": "^4.2.1",
-            "lodash.reduce": "^4.4.0",
-            "lodash.reject": "^4.4.0",
-            "lodash.some": "^4.4.0"
-          }
-        },
-        "css-select": {
-          "version": "1.2.0",
-          "dev": true,
-          "requires": {
-            "boolbase": "~1.0.0",
-            "css-what": "2.1",
-            "domutils": "1.5.1",
-            "nth-check": "~1.0.1"
-          }
-        },
-        "css-what": {
-          "version": "2.1.3",
-          "dev": true
-        },
-        "dom-serializer": {
-          "version": "0.1.1",
-          "dev": true,
-          "requires": {
-            "domelementtype": "^1.3.0",
-            "entities": "^1.1.1"
-          }
-        },
-        "domelementtype": {
-          "version": "1.3.1",
-          "dev": true
-        },
-        "domhandler": {
-          "version": "2.4.2",
-          "dev": true,
-          "requires": {
-            "domelementtype": "1"
-          }
-        },
-        "domutils": {
-          "version": "1.5.1",
-          "dev": true,
-          "requires": {
-            "dom-serializer": "0",
-            "domelementtype": "1"
-          }
-        },
-        "entities": {
-          "version": "1.1.2",
-          "dev": true
-        },
-        "htmlparser2": {
-          "version": "3.10.1",
-          "dev": true,
-          "requires": {
-            "domelementtype": "^1.3.1",
-            "domhandler": "^2.3.0",
-            "domutils": "^1.5.1",
-            "entities": "^1.1.1",
-            "inherits": "^2.0.1",
-            "readable-stream": "^3.1.1"
-          }
-        },
-        "nth-check": {
-          "version": "1.0.2",
-          "dev": true,
-          "requires": {
-            "boolbase": "~1.0.0"
-          }
-        },
-        "readable-stream": {
-          "version": "3.6.0",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
     "load-json-file": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
       "requires": {
         "graceful-fs": "^4.1.2",
         "parse-json": "^4.0.0",
@@ -36647,14 +36245,6 @@
     "lodash-es": {
       "version": "4.17.20"
     },
-    "lodash.assignin": {
-      "version": "4.2.0",
-      "dev": true
-    },
-    "lodash.bind": {
-      "version": "4.2.1",
-      "dev": true
-    },
     "lodash.camelcase": {
       "version": "4.3.0"
     },
@@ -36667,22 +36257,10 @@
     "lodash.debounce": {
       "version": "4.0.8"
     },
-    "lodash.defaults": {
-      "version": "4.2.0",
-      "dev": true
-    },
     "lodash.escape": {
       "version": "4.0.1",
       "dev": true
     },
-    "lodash.filter": {
-      "version": "4.6.0",
-      "dev": true
-    },
-    "lodash.flatten": {
-      "version": "4.4.0",
-      "dev": true
-    },
     "lodash.flattendeep": {
       "version": "4.4.0",
       "dev": true
@@ -36690,10 +36268,6 @@
     "lodash.flow": {
       "version": "3.5.0"
     },
-    "lodash.foreach": {
-      "version": "4.5.0",
-      "dev": true
-    },
     "lodash.has": {
       "version": "4.5.2"
     },
@@ -36719,36 +36293,12 @@
     "lodash.isstring": {
       "version": "4.0.1"
     },
-    "lodash.map": {
-      "version": "4.6.0",
-      "dev": true
-    },
     "lodash.memoize": {
       "version": "4.1.2"
     },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "dev": true
-    },
     "lodash.once": {
       "version": "4.1.1"
     },
-    "lodash.pick": {
-      "version": "4.4.0",
-      "dev": true
-    },
-    "lodash.reduce": {
-      "version": "4.6.0",
-      "dev": true
-    },
-    "lodash.reject": {
-      "version": "4.6.0",
-      "dev": true
-    },
-    "lodash.some": {
-      "version": "4.6.0",
-      "dev": true
-    },
     "lodash.sortby": {
       "version": "4.7.0"
     },
@@ -36891,19 +36441,6 @@
       "version": "0.3.0",
       "dev": true
     },
-    "mediaquery-text": {
-      "version": "1.1.5",
-      "dev": true,
-      "requires": {
-        "cssom": "^0.4.4"
-      },
-      "dependencies": {
-        "cssom": {
-          "version": "0.4.4",
-          "dev": true
-        }
-      }
-    },
     "mem": {
       "version": "4.3.0",
       "dev": true,
@@ -37036,10 +36573,16 @@
       }
     },
     "minimalistic-assert": {
-      "version": "1.0.1"
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
     },
     "minimalistic-crypto-utils": {
-      "version": "1.0.1"
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
     },
     "minimatch": {
       "version": "3.0.4",
@@ -37246,10 +36789,6 @@
     "neo-async": {
       "version": "2.6.2"
     },
-    "netmask": {
-      "version": "1.0.6",
-      "dev": true
-    },
     "next-tick": {
       "version": "1.0.0"
     },
@@ -37491,6 +37030,9 @@
     },
     "object.entries": {
       "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.0.tgz",
+      "integrity": "sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==",
+      "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
         "es-abstract": "^1.12.0",
@@ -37500,6 +37042,9 @@
       "dependencies": {
         "es-abstract": {
           "version": "1.17.7",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+          "dev": true,
           "requires": {
             "es-to-primitive": "^1.2.1",
             "function-bind": "^1.1.1",
@@ -37814,30 +37359,6 @@
     "p-try": {
       "version": "2.2.0"
     },
-    "pac-proxy-agent": {
-      "version": "4.1.0",
-      "dev": true,
-      "requires": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4",
-        "get-uri": "3",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "5",
-        "pac-resolver": "^4.1.0",
-        "raw-body": "^2.2.0",
-        "socks-proxy-agent": "5"
-      }
-    },
-    "pac-resolver": {
-      "version": "4.1.0",
-      "dev": true,
-      "requires": {
-        "degenerator": "^2.2.0",
-        "ip": "^1.1.5",
-        "netmask": "^1.0.6"
-      }
-    },
     "pako": {
       "version": "1.0.11"
     },
@@ -38019,13 +37540,6 @@
     "performance-now": {
       "version": "2.1.0"
     },
-    "pick-util": {
-      "version": "1.1.3",
-      "dev": true,
-      "requires": {
-        "@jonkemp/package-utils": "^1.0.6"
-      }
-    },
     "picomatch": {
       "version": "2.2.2"
     },
@@ -38307,35 +37821,6 @@
     "promise-inflight": {
       "version": "1.0.1"
     },
-    "promise-polyfill": {
-      "version": "8.1.0"
-    },
-    "promise.prototype.finally": {
-      "version": "3.1.0",
-      "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.9.0",
-        "function-bind": "^1.1.1"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.7",
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        }
-      }
-    },
     "prompts": {
       "version": "2.4.0",
       "requires": {
@@ -38374,33 +37859,6 @@
         "ipaddr.js": "1.9.1"
       }
     },
-    "proxy-agent": {
-      "version": "4.0.1",
-      "dev": true,
-      "requires": {
-        "agent-base": "^6.0.0",
-        "debug": "4",
-        "http-proxy-agent": "^4.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "lru-cache": "^5.1.1",
-        "pac-proxy-agent": "^4.1.0",
-        "proxy-from-env": "^1.0.0",
-        "socks-proxy-agent": "^5.0.0"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "5.1.1",
-          "dev": true,
-          "requires": {
-            "yallist": "^3.0.2"
-          }
-        },
-        "yallist": {
-          "version": "3.1.1",
-          "dev": true
-        }
-      }
-    },
     "proxy-from-env": {
       "version": "1.1.0",
       "dev": true
@@ -38512,20 +37970,6 @@
     "pure-color": {
       "version": "1.3.0"
     },
-    "pvtsutils": {
-      "version": "1.1.1",
-      "requires": {
-        "tslib": "^2.0.3"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.1.0"
-        }
-      }
-    },
-    "pvutils": {
-      "version": "1.0.17"
-    },
     "q": {
       "version": "1.5.1"
     },
@@ -38580,16 +38024,6 @@
       "version": "1.2.1",
       "dev": true
     },
-    "raw-body": {
-      "version": "2.4.1",
-      "dev": true,
-      "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.3",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      }
-    },
     "raw-loader": {
       "version": "0.5.1",
       "dev": true
@@ -39058,15 +38492,6 @@
         "xtend": "^4.0.1"
       }
     },
-    "remote-content": {
-      "version": "1.2.3",
-      "dev": true,
-      "requires": {
-        "proxy-from-env": "^1.0.0",
-        "superagent": "^5.2.1",
-        "superagent-proxy": "^2.0.0"
-      }
-    },
     "remove-trailing-separator": {
       "version": "1.1.0"
     },
@@ -39776,14 +39201,6 @@
         }
       }
     },
-    "slick": {
-      "version": "1.12.2",
-      "dev": true
-    },
-    "smart-buffer": {
-      "version": "4.1.0",
-      "dev": true
-    },
     "snapdragon": {
       "version": "0.8.2",
       "requires": {
@@ -39907,23 +39324,6 @@
         }
       }
     },
-    "socks": {
-      "version": "2.5.1",
-      "dev": true,
-      "requires": {
-        "ip": "^1.1.5",
-        "smart-buffer": "^4.1.0"
-      }
-    },
-    "socks-proxy-agent": {
-      "version": "5.0.0",
-      "dev": true,
-      "requires": {
-        "agent-base": "6",
-        "debug": "4",
-        "socks": "^2.3.3"
-      }
-    },
     "source-list-map": {
       "version": "2.0.1"
     },
@@ -40025,10 +39425,6 @@
         }
       }
     },
-    "specificity": {
-      "version": "0.3.2",
-      "dev": true
-    },
     "split-string": {
       "version": "3.1.0",
       "requires": {
@@ -40224,112 +39620,6 @@
       "version": "2.0.1",
       "devOptional": true
     },
-    "style-data": {
-      "version": "1.4.7",
-      "dev": true,
-      "requires": {
-        "cheerio": "^0.22.0",
-        "mediaquery-text": "^1.1.5",
-        "pick-util": "^1.1.3"
-      },
-      "dependencies": {
-        "cheerio": {
-          "version": "0.22.0",
-          "dev": true,
-          "requires": {
-            "css-select": "~1.2.0",
-            "dom-serializer": "~0.1.0",
-            "entities": "~1.1.1",
-            "htmlparser2": "^3.9.1",
-            "lodash.assignin": "^4.0.9",
-            "lodash.bind": "^4.1.4",
-            "lodash.defaults": "^4.0.1",
-            "lodash.filter": "^4.4.0",
-            "lodash.flatten": "^4.2.0",
-            "lodash.foreach": "^4.3.0",
-            "lodash.map": "^4.4.0",
-            "lodash.merge": "^4.4.0",
-            "lodash.pick": "^4.2.1",
-            "lodash.reduce": "^4.4.0",
-            "lodash.reject": "^4.4.0",
-            "lodash.some": "^4.4.0"
-          }
-        },
-        "css-select": {
-          "version": "1.2.0",
-          "dev": true,
-          "requires": {
-            "boolbase": "~1.0.0",
-            "css-what": "2.1",
-            "domutils": "1.5.1",
-            "nth-check": "~1.0.1"
-          }
-        },
-        "css-what": {
-          "version": "2.1.3",
-          "dev": true
-        },
-        "dom-serializer": {
-          "version": "0.1.1",
-          "dev": true,
-          "requires": {
-            "domelementtype": "^1.3.0",
-            "entities": "^1.1.1"
-          }
-        },
-        "domelementtype": {
-          "version": "1.3.1",
-          "dev": true
-        },
-        "domhandler": {
-          "version": "2.4.2",
-          "dev": true,
-          "requires": {
-            "domelementtype": "1"
-          }
-        },
-        "domutils": {
-          "version": "1.5.1",
-          "dev": true,
-          "requires": {
-            "dom-serializer": "0",
-            "domelementtype": "1"
-          }
-        },
-        "entities": {
-          "version": "1.1.2",
-          "dev": true
-        },
-        "htmlparser2": {
-          "version": "3.10.1",
-          "dev": true,
-          "requires": {
-            "domelementtype": "^1.3.1",
-            "domhandler": "^2.3.0",
-            "domutils": "^1.5.1",
-            "entities": "^1.1.1",
-            "inherits": "^2.0.1",
-            "readable-stream": "^3.1.1"
-          }
-        },
-        "nth-check": {
-          "version": "1.0.2",
-          "dev": true,
-          "requires": {
-            "boolbase": "~1.0.0"
-          }
-        },
-        "readable-stream": {
-          "version": "3.6.0",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
     "style-loader": {
       "version": "0.23.0",
       "dev": true,
@@ -40373,67 +39663,6 @@
       "version": "0.0.10",
       "requires": {}
     },
-    "superagent": {
-      "version": "5.3.1",
-      "dev": true,
-      "requires": {
-        "component-emitter": "^1.3.0",
-        "cookiejar": "^2.1.2",
-        "debug": "^4.1.1",
-        "fast-safe-stringify": "^2.0.7",
-        "form-data": "^3.0.0",
-        "formidable": "^1.2.2",
-        "methods": "^1.1.2",
-        "mime": "^2.4.6",
-        "qs": "^6.9.4",
-        "readable-stream": "^3.6.0",
-        "semver": "^7.3.2"
-      },
-      "dependencies": {
-        "form-data": {
-          "version": "3.0.0",
-          "dev": true,
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.8",
-            "mime-types": "^2.1.12"
-          }
-        },
-        "readable-stream": {
-          "version": "3.6.0",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
-        "semver": {
-          "version": "7.3.4",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "superagent-proxy": {
-      "version": "2.1.0",
-      "dev": true,
-      "requires": {
-        "debug": "^3.1.0",
-        "proxy-agent": "^4.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
     "supports-color": {
       "version": "5.5.0",
       "requires": {
@@ -40588,6 +39817,8 @@
     },
     "terser": {
       "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
+      "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
       "requires": {
         "commander": "^2.20.0",
         "source-map": "~0.6.1",
@@ -40595,32 +39826,37 @@
       },
       "dependencies": {
         "source-map": {
-          "version": "0.6.1"
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
     "terser-webpack-plugin": {
-      "version": "3.0.5",
-      "dev": true,
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.1.0.tgz",
+      "integrity": "sha512-cjdZte66fYkZ65rQ2oJfrdCAkkhJA7YLYk5eGOcGCSGlq0ieZupRdjedSQXYknMPo2IveQL+tPdrxUkERENCFA==",
       "requires": {
-        "cacache": "^15.0.4",
+        "cacache": "^15.0.5",
         "find-cache-dir": "^3.3.1",
-        "jest-worker": "^26.0.0",
-        "p-limit": "^3.0.1",
+        "jest-worker": "^26.2.1",
+        "p-limit": "^3.0.2",
         "schema-utils": "^2.6.6",
         "serialize-javascript": "^4.0.0",
         "source-map": "^0.6.1",
-        "terser": "^4.6.13",
+        "terser": "^4.8.0",
         "webpack-sources": "^1.4.3"
       },
       "dependencies": {
         "has-flag": {
           "version": "4.0.0",
-          "dev": true
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "jest-worker": {
           "version": "26.6.2",
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+          "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
           "requires": {
             "@types/node": "*",
             "merge-stream": "^2.0.0",
@@ -40629,25 +39865,29 @@
         },
         "p-limit": {
           "version": "3.1.0",
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
           "requires": {
             "yocto-queue": "^0.1.0"
           }
         },
         "serialize-javascript": {
           "version": "4.0.0",
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+          "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
           "requires": {
             "randombytes": "^2.1.0"
           }
         },
         "source-map": {
           "version": "0.6.1",
-          "dev": true
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         },
         "supports-color": {
           "version": "7.2.0",
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "requires": {
             "has-flag": "^4.0.0"
           }
@@ -40663,9 +39903,6 @@
         "require-main-filename": "^2.0.0"
       }
     },
-    "text-encoding": {
-      "version": "0.7.0"
-    },
     "text-table": {
       "version": "0.2.0"
     },
@@ -41214,9 +40451,6 @@
         "requires-port": "^1.0.0"
       }
     },
-    "url-polyfill": {
-      "version": "1.1.7"
-    },
     "use": {
       "version": "3.1.1"
     },
@@ -41507,48 +40741,6 @@
         "minimalistic-assert": "^1.0.0"
       }
     },
-    "webcrypto-core": {
-      "version": "1.1.9",
-      "requires": {
-        "@peculiar/asn1-schema": "^2.0.12",
-        "@peculiar/json-schema": "^1.1.12",
-        "asn1js": "^2.0.26",
-        "pvtsutils": "^1.0.11",
-        "tslib": "^2.0.1"
-      },
-      "dependencies": {
-        "@peculiar/asn1-schema": {
-          "version": "2.0.27",
-          "requires": {
-            "@types/asn1js": "^2.0.0",
-            "asn1js": "^2.0.26",
-            "pvtsutils": "^1.1.1",
-            "tslib": "^2.0.3"
-          }
-        },
-        "tslib": {
-          "version": "2.1.0"
-        }
-      }
-    },
-    "webcrypto-liner": {
-      "version": "1.1.4",
-      "requires": {
-        "@peculiar/asn1-schema": "^1.0.3",
-        "@peculiar/json-schema": "^1.1.9",
-        "asmcrypto.js": "^2.3.2",
-        "asn1js": "^2.0.26",
-        "core-js": "^3.5.0",
-        "des.js": "^1.0.1",
-        "elliptic": "^6.5.2",
-        "pvtsutils": "^1.0.9",
-        "tslib": "^1.10.0",
-        "webcrypto-core": "^1.0.17"
-      }
-    },
-    "webfontloader": {
-      "version": "1.6.28"
-    },
     "webidl-conversions": {
       "version": "4.0.2"
     },
@@ -42084,9 +41276,6 @@
         "iconv-lite": "0.4.24"
       }
     },
-    "whatwg-fetch": {
-      "version": "3.0.0"
-    },
     "whatwg-mimetype": {
       "version": "2.3.0"
     },
@@ -42311,7 +41500,8 @@
     },
     "yocto-queue": {
       "version": "0.1.0",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
     }
   }
 }
diff --git a/package.json b/package.json
index c34547bef..00e231a7f 100644
--- a/package.json
+++ b/package.json
@@ -44,9 +44,7 @@
     "@types/node-fetch": "2.5.7",
     "@uifabric/react-cards": "0.109.110",
     "@uifabric/styling": "7.13.7",
-    "abort-controller": "3.0.0",
     "applicationinsights": "1.8.0",
-    "babel-polyfill": "6.26.0",
     "bootstrap": "3.4.1",
     "canvas": "file:./canvas",
     "clean-webpack-plugin": "0.1.19",
@@ -61,8 +59,6 @@
     "date-fns": "1.29.0",
     "dayjs": "1.8.19",
     "dotenv": "8.2.0",
-    "es6-object-assign": "1.1.0",
-    "es6-symbol": "3.1.3",
     "eslint-plugin-jest": "23.13.2",
     "eslint-plugin-react": "7.20.0",
     "hasher": "1.2.0",
@@ -80,12 +76,9 @@
     "monaco-editor": "0.18.1",
     "ms": "2.1.3",
     "msal": "1.4.4",
-    "object.entries": "1.1.0",
     "office-ui-fabric-react": "7.164.2",
     "p-retry": "4.2.0",
     "plotly.js-cartesian-dist-min": "1.52.3",
-    "promise-polyfill": "8.1.0",
-    "promise.prototype.finally": "3.1.0",
     "q": "1.5.1",
     "react": "16.13.1",
     "react-animate-height": "2.0.8",
@@ -102,13 +95,9 @@
     "rxjs": "6.6.3",
     "styled-components": "4.3.2",
     "swr": "0.4.0",
-    "text-encoding": "0.7.0",
+    "terser-webpack-plugin": "3.1.0",
     "underscore": "1.9.1",
-    "url-polyfill": "1.1.7",
-    "utility-types": "3.10.0",
-    "webcrypto-liner": "1.1.4",
-    "webfontloader": "1.6.28",
-    "whatwg-fetch": "3.0.0"
+    "utility-types": "3.10.0"
   },
   "devDependencies": {
     "@babel/core": "7.9.0",
@@ -138,9 +127,7 @@
     "@types/react-redux": "7.1.7",
     "@types/sinon": "2.3.3",
     "@types/styled-components": "5.1.1",
-    "@types/text-encoding": "0.0.33",
     "@types/underscore": "1.7.36",
-    "@types/webfontloader": "1.6.29",
     "@typescript-eslint/eslint-plugin": "4.0.1",
     "@typescript-eslint/parser": "4.0.1",
     "axe-puppeteer": "1.1.0",
@@ -165,7 +152,6 @@
     "html-loader": "0.5.5",
     "html-loader-jest": "0.2.1",
     "html-webpack-plugin": "3.2.0",
-    "inline-css": "2.2.5",
     "jest": "25.5.4",
     "jest-canvas-mock": "2.1.0",
     "jest-puppeteer": "4.4.0",
@@ -182,7 +168,6 @@
     "rimraf": "3.0.0",
     "sinon": "3.2.1",
     "style-loader": "0.23.0",
-    "terser-webpack-plugin": "3.0.5",
     "ts-loader": "6.2.2",
     "tslint": "5.11.0",
     "tslint-microsoft-contrib": "6.0.0",
diff --git a/src/Common/QueriesClient.ts b/src/Common/QueriesClient.ts
index 3ecac7051..b7146fdbf 100644
--- a/src/Common/QueriesClient.ts
+++ b/src/Common/QueriesClient.ts
@@ -6,7 +6,7 @@ import Explorer from "../Explorer/Explorer";
 import DocumentsTab from "../Explorer/Tabs/DocumentsTab";
 import DocumentId from "../Explorer/Tree/DocumentId";
 import * as NotificationConsoleUtils from "../Utils/NotificationConsoleUtils";
-import { QueryUtils } from "../Utils/QueryUtils";
+import * as QueryUtils from "../Utils/QueryUtils";
 import { BackendDefaults, HttpStatusCodes, SavedQueries } from "./Constants";
 import { userContext } from "../UserContext";
 import { queryDocumentsPage } from "./dataAccess/queryDocumentsPage";
diff --git a/src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap b/src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap
index f9640bb5f..db5addf25 100644
--- a/src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap
@@ -32,7 +32,6 @@ exports[`SettingsComponent renders 1`] = `
                 "_closeSynapseLinkModalDialog": [Function],
                 "_isAfecFeatureRegistered": [Function],
                 "_isInitializingNotebooks": false,
-                "_isSystemDatabasePredicate": [Function],
                 "_panes": Array [
                   AddDatabasePane {
                     "autoPilotUsageCost": [Function],
@@ -974,7 +973,6 @@ exports[`SettingsComponent renders 1`] = `
                   "title": [Function],
                   "visible": [Function],
                 },
-                "nonSystemDatabases": [Function],
                 "notebookBasePath": [Function],
                 "notebookServerInfo": [Function],
                 "onRefreshDatabasesKeyPress": [Function],
@@ -1228,7 +1226,6 @@ exports[`SettingsComponent renders 1`] = `
               "_closeSynapseLinkModalDialog": [Function],
               "_isAfecFeatureRegistered": [Function],
               "_isInitializingNotebooks": false,
-              "_isSystemDatabasePredicate": [Function],
               "_panes": Array [
                 AddDatabasePane {
                   "autoPilotUsageCost": [Function],
@@ -2170,7 +2167,6 @@ exports[`SettingsComponent renders 1`] = `
                 "title": [Function],
                 "visible": [Function],
               },
-              "nonSystemDatabases": [Function],
               "notebookBasePath": [Function],
               "notebookServerInfo": [Function],
               "onRefreshDatabasesKeyPress": [Function],
@@ -2437,7 +2433,6 @@ exports[`SettingsComponent renders 1`] = `
                 "_closeSynapseLinkModalDialog": [Function],
                 "_isAfecFeatureRegistered": [Function],
                 "_isInitializingNotebooks": false,
-                "_isSystemDatabasePredicate": [Function],
                 "_panes": Array [
                   AddDatabasePane {
                     "autoPilotUsageCost": [Function],
@@ -3379,7 +3374,6 @@ exports[`SettingsComponent renders 1`] = `
                   "title": [Function],
                   "visible": [Function],
                 },
-                "nonSystemDatabases": [Function],
                 "notebookBasePath": [Function],
                 "notebookServerInfo": [Function],
                 "onRefreshDatabasesKeyPress": [Function],
@@ -3633,7 +3627,6 @@ exports[`SettingsComponent renders 1`] = `
               "_closeSynapseLinkModalDialog": [Function],
               "_isAfecFeatureRegistered": [Function],
               "_isInitializingNotebooks": false,
-              "_isSystemDatabasePredicate": [Function],
               "_panes": Array [
                 AddDatabasePane {
                   "autoPilotUsageCost": [Function],
@@ -4575,7 +4568,6 @@ exports[`SettingsComponent renders 1`] = `
                 "title": [Function],
                 "visible": [Function],
               },
-              "nonSystemDatabases": [Function],
               "notebookBasePath": [Function],
               "notebookServerInfo": [Function],
               "onRefreshDatabasesKeyPress": [Function],
diff --git a/src/Explorer/Controls/SmartUi/SmartUiComponent.test.tsx b/src/Explorer/Controls/SmartUi/SmartUiComponent.test.tsx
index 91bc16815..ec3298812 100644
--- a/src/Explorer/Controls/SmartUi/SmartUiComponent.test.tsx
+++ b/src/Explorer/Controls/SmartUi/SmartUiComponent.test.tsx
@@ -1,7 +1,7 @@
-import React from "react";
 import { shallow } from "enzyme";
+import React from "react";
+import { DescriptionType, NumberUiType, SmartUiInput } from "../../../SelfServe/SelfServeTypes";
 import { SmartUiComponent, SmartUiDescriptor } from "./SmartUiComponent";
-import { NumberUiType, SmartUiInput, DescriptionType } from "../../../SelfServe/SelfServeTypes";
 
 describe("SmartUiComponent", () => {
   const exampleData: SmartUiDescriptor = {
@@ -97,9 +97,9 @@ describe("SmartUiComponent", () => {
             dataFieldName: "database",
             type: "object",
             choices: [
-              { label: "Database 1", key: "db1" },
-              { label: "Database 2", key: "db2" },
-              { label: "Database 3", key: "db3" },
+              { labelTKey: "Database 1", key: "db1" },
+              { labelTKey: "Database 2", key: "db2" },
+              { labelTKey: "Database 3", key: "db3" },
             ],
             defaultKey: "db2",
           },
diff --git a/src/Explorer/Controls/SmartUi/SmartUiComponent.tsx b/src/Explorer/Controls/SmartUi/SmartUiComponent.tsx
index 4ca14a266..34e7be8bb 100644
--- a/src/Explorer/Controls/SmartUi/SmartUiComponent.tsx
+++ b/src/Explorer/Controls/SmartUi/SmartUiComponent.tsx
@@ -334,7 +334,7 @@ export class SmartUiComponent extends React.Component<SmartUiComponentProps, Sma
           dropdownWidth="auto"
           options={choices.map((c) => ({
             key: c.key,
-            text: this.props.getTranslation(c.label),
+            text: this.props.getTranslation(c.labelTKey),
           }))}
           styles={{
             root: { width: 400 },
diff --git a/src/Explorer/DataSamples/ContainerSampleGenerator.test.ts b/src/Explorer/DataSamples/ContainerSampleGenerator.test.ts
index ce917e840..13ec16270 100644
--- a/src/Explorer/DataSamples/ContainerSampleGenerator.test.ts
+++ b/src/Explorer/DataSamples/ContainerSampleGenerator.test.ts
@@ -2,17 +2,17 @@ jest.mock("../Graph/GraphExplorerComponent/GremlinClient");
 jest.mock("../../Common/dataAccess/createCollection");
 jest.mock("../../Common/dataAccess/createDocument");
 import * as ko from "knockout";
-import * as ViewModels from "../../Contracts/ViewModels";
 import Q from "q";
-import { ContainerSampleGenerator } from "./ContainerSampleGenerator";
 import { createDocument } from "../../Common/dataAccess/createDocument";
-import Explorer from "../Explorer";
+import * as ViewModels from "../../Contracts/ViewModels";
 import { updateUserContext } from "../../UserContext";
+import Explorer from "../Explorer";
+import { ContainerSampleGenerator } from "./ContainerSampleGenerator";
 
 describe("ContainerSampleGenerator", () => {
   const createExplorerStub = (database: ViewModels.Database): Explorer => {
     const explorerStub = {} as Explorer;
-    explorerStub.nonSystemDatabases = ko.computed(() => [database]);
+    explorerStub.databases = ko.observableArray<ViewModels.Database>([database]);
     explorerStub.isPreferredApiGraph = ko.computed<boolean>(() => false);
     explorerStub.isPreferredApiMongoDB = ko.computed<boolean>(() => false);
     explorerStub.isPreferredApiDocumentDB = ko.computed<boolean>(() => false);
diff --git a/src/Explorer/DataSamples/DataSamplesUtil.test.ts b/src/Explorer/DataSamples/DataSamplesUtil.test.ts
index 634354c8d..9a35158f5 100644
--- a/src/Explorer/DataSamples/DataSamplesUtil.test.ts
+++ b/src/Explorer/DataSamples/DataSamplesUtil.test.ts
@@ -1,9 +1,9 @@
-import { DataSamplesUtil } from "./DataSamplesUtil";
-import * as sinon from "sinon";
-import { ContainerSampleGenerator } from "./ContainerSampleGenerator";
 import * as ko from "knockout";
+import * as sinon from "sinon";
+import { Collection, Database } from "../../Contracts/ViewModels";
 import Explorer from "../Explorer";
-import { Database, Collection } from "../../Contracts/ViewModels";
+import { ContainerSampleGenerator } from "./ContainerSampleGenerator";
+import { DataSamplesUtil } from "./DataSamplesUtil";
 
 describe("DataSampleUtils", () => {
   const sampleCollectionId = "sampleCollectionId";
@@ -16,7 +16,7 @@ describe("DataSampleUtils", () => {
       collections: ko.observableArray<Collection>([collection]),
     } as Database;
     const explorer = {} as Explorer;
-    explorer.nonSystemDatabases = ko.computed(() => [database]);
+    explorer.databases = ko.observableArray<Database>([database]);
     explorer.showOkModalDialog = () => {};
     const dataSamplesUtil = new DataSamplesUtil(explorer);
 
diff --git a/src/Explorer/DataSamples/DataSamplesUtil.ts b/src/Explorer/DataSamples/DataSamplesUtil.ts
index 81e191048..aa3d01253 100644
--- a/src/Explorer/DataSamples/DataSamplesUtil.ts
+++ b/src/Explorer/DataSamples/DataSamplesUtil.ts
@@ -1,8 +1,8 @@
 import * as ViewModels from "../../Contracts/ViewModels";
-import { ContainerSampleGenerator } from "./ContainerSampleGenerator";
 import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils";
-import { ConsoleDataType } from "../Menus/NotificationConsole/NotificationConsoleComponent";
 import Explorer from "../Explorer";
+import { ConsoleDataType } from "../Menus/NotificationConsole/NotificationConsoleComponent";
+import { ContainerSampleGenerator } from "./ContainerSampleGenerator";
 
 export class DataSamplesUtil {
   private static readonly DialogTitle = "Create Sample Container";
@@ -17,7 +17,7 @@ export class DataSamplesUtil {
 
     const databaseName = generator.getDatabaseId();
     const containerName = generator.getCollectionId();
-    if (this.hasContainer(databaseName, containerName, this.container.nonSystemDatabases())) {
+    if (this.hasContainer(databaseName, containerName, this.container.databases())) {
       const msg = `The container ${containerName} in database ${databaseName} already exists. Please delete it and retry.`;
       this.container.showOkModalDialog(DataSamplesUtil.DialogTitle, msg);
       NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, msg);
diff --git a/src/Explorer/Explorer.tsx b/src/Explorer/Explorer.tsx
index 2b3da2ede..095909ee1 100644
--- a/src/Explorer/Explorer.tsx
+++ b/src/Explorer/Explorer.tsx
@@ -180,7 +180,6 @@ export default class Explorer {
 
   // Resource Tree
   public databases: ko.ObservableArray<ViewModels.Database>;
-  public nonSystemDatabases: ko.Computed<ViewModels.Database[]>;
   public selectedDatabaseId: ko.Computed<string>;
   public selectedCollectionId: ko.Computed<string>;
   public isLeftPaneExpanded: ko.Observable<boolean>;
@@ -256,7 +255,6 @@ export default class Explorer {
   public closeDialog: ExplorerParams["closeDialog"];
 
   private _panes: ContextualPaneBase[] = [];
-  private _isSystemDatabasePredicate: (database: ViewModels.Database) => boolean = (database) => false;
   private _isInitializingNotebooks: boolean;
   private notebookBasePath: ko.Observable<string>;
   private _arcadiaManager: ArcadiaResourceManager;
@@ -527,17 +525,6 @@ export default class Explorer {
         configContext.platform === Platform.Portal && !this.isRunningOnNationalCloud() && !this.isPreferredApiGraph()
     );
     this.isRightPanelV2Enabled = ko.computed<boolean>(() => userContext.features.enableRightPanelV2);
-    this.defaultExperience.subscribe((defaultExperience: string) => {
-      if (
-        defaultExperience &&
-        defaultExperience.toLowerCase() === Constants.DefaultAccountExperience.Cassandra.toLowerCase()
-      ) {
-        this._isSystemDatabasePredicate = (database: ViewModels.Database): boolean => {
-          return database.id() === "system";
-        };
-      }
-    });
-
     this.selectedDatabaseId = ko.computed<string>(() => {
       const selectedNode = this.selectedNode();
       if (!selectedNode) {
@@ -559,10 +546,6 @@ export default class Explorer {
       }
     });
 
-    this.nonSystemDatabases = ko.computed(() => {
-      return this.databases().filter((database: ViewModels.Database) => !this._isSystemDatabasePredicate(database));
-    });
-
     this.addCollectionPane = new AddCollectionPane({
       isPreferredApiTable: ko.computed(() => this.isPreferredApiTable()),
       id: "addcollectionpane",
diff --git a/src/Explorer/Graph/GraphExplorerComponent/GremlinSimpleClient.ts b/src/Explorer/Graph/GraphExplorerComponent/GremlinSimpleClient.ts
index 1ca0365c3..e61f81964 100644
--- a/src/Explorer/Graph/GraphExplorerComponent/GremlinSimpleClient.ts
+++ b/src/Explorer/Graph/GraphExplorerComponent/GremlinSimpleClient.ts
@@ -4,11 +4,8 @@
  * - inspired from gremlin-javascript for nodejs: https://github.com/jbmusso/gremlin-javascript
  * - tested on cosmosdb gremlin server
  * - only supports sessionless gremlin requests
- * - Relies on text-encoding polyfill (github.com/inexorabletash/text-encoding) for TextEncoder/TextDecoder on IE, Edge.
  */
 
-import { TextEncoder, TextDecoder } from "text-encoding";
-
 export interface GremlinSimpleClientParameters {
   endpoint: string; // The websocket endpoint
   user: string;
diff --git a/src/Explorer/Panes/CassandraAddCollectionPane.html b/src/Explorer/Panes/CassandraAddCollectionPane.html
index c426a272e..2450196ee 100644
--- a/src/Explorer/Panes/CassandraAddCollectionPane.html
+++ b/src/Explorer/Panes/CassandraAddCollectionPane.html
@@ -114,7 +114,7 @@
               aria-label="Keyspace id"
             />
 
-            <datalist id="keyspacesList" data-bind="foreach: container.nonSystemDatabases">
+            <datalist id="keyspacesList" data-bind="foreach: container.databases">
               <option data-bind="value: $data.id"></option>
             </datalist>
 
diff --git a/src/Explorer/Panes/CassandraAddCollectionPane.ts b/src/Explorer/Panes/CassandraAddCollectionPane.ts
index 92bfa87bc..44cf83a7f 100644
--- a/src/Explorer/Panes/CassandraAddCollectionPane.ts
+++ b/src/Explorer/Panes/CassandraAddCollectionPane.ts
@@ -261,10 +261,8 @@ export default class CassandraAddCollectionPane extends ContextualPaneBase {
         });
         this.keyspaceIds(cachedKeyspaceIdsList);
       };
-      this.container.nonSystemDatabases.subscribe((newDatabases: ViewModels.Database[]) =>
-        updateKeyspaceIds(newDatabases)
-      );
-      updateKeyspaceIds(this.container.nonSystemDatabases());
+      this.container.databases.subscribe((newDatabases: ViewModels.Database[]) => updateKeyspaceIds(newDatabases));
+      updateKeyspaceIds(this.container.databases());
     }
 
     this.autoPilotUsageCost = ko.pureComputed<string>(() => {
diff --git a/src/Explorer/Tabs/DocumentsTab.ts b/src/Explorer/Tabs/DocumentsTab.ts
index f678db1b6..b27028d3b 100644
--- a/src/Explorer/Tabs/DocumentsTab.ts
+++ b/src/Explorer/Tabs/DocumentsTab.ts
@@ -11,7 +11,7 @@ import editable from "../../Common/EditableUtility";
 import * as HeadersUtility from "../../Common/HeadersUtility";
 import TabsBase from "./TabsBase";
 import { DocumentsGridMetrics } from "../../Common/Constants";
-import { QueryUtils } from "../../Utils/QueryUtils";
+import * as QueryUtils from "../../Utils/QueryUtils";
 import { Splitter, SplitterBounds, SplitterDirection } from "../../Common/Splitter";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import NewDocumentIcon from "../../../images/NewDocument.svg";
diff --git a/src/Explorer/Tabs/MongoQueryTab.html b/src/Explorer/Tabs/MongoQueryTab.html
deleted file mode 100644
index 4302c986f..000000000
--- a/src/Explorer/Tabs/MongoQueryTab.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<div
-  class="tab-pane"
-  data-bind="
-                            attr:{
-                                id: tabId
-                            }"
-  role="tabpanel"
->
-  <!-- Query Tab Command Bar - Start -->
-  <div class="contentdiv">
-    <div class="tabCommandButton">
-      <!-- Execute Query - Start -->
-      <span
-        class="commandButton"
-        data-bind="
-                                            click: onExecuteQueryClick,
-                                            visible: executeQueryButton.visible() && executeQueryButton.enabled()"
-      >
-        <img class="imgiconwidth" src="/ExecuteQuery.svg" />Run
-      </span>
-      <span
-        class="commandButton tabCommandDisabled"
-        data-bind="
-                                            visible: executeQueryButton.visible() && !executeQueryButton.enabled()"
-      >
-        <img class="imgiconwidth" src="/ExecuteQuery-disabled.svg" />Run
-      </span>
-      <!-- Execute Query - End -->
-    </div>
-  </div>
-  <!-- Query Tab Command Bar - End -->
-
-  <div
-    class="queryEditor"
-    data-bind="
-                                    attr: {
-                                        id: queryEditorId
-                                    },
-                                    css: {
-                                        mongoQueryEditor:$root.isPreferredApiMongoDB()
-                                    }"
-  ></div>
-  <div
-    style="margin-left: 50px; margin-top: -75px"
-    data-bind="
-                                visible: $root.isPreferredApiMongoDB() && sqlQueryEditorContent().length == 0"
-  >
-    Start by writing a Mongo query, for example: <strong>{'id':'foo'}</strong> or <strong>{ }</strong> to get all the
-    documents.
-  </div>
-  <!-- Query Errors Tab - Start-->
-  <div class="active queryErrorsHeaderContainer" data-bind="visible: errors().length > 0">
-    <span
-      class="queryErrors"
-      data-toggle="tab"
-      data-bind="
-                                    attr: {
-                                        href: '#queryerrors' + tabId
-                                    }"
-      >Errors</span
-    >
-  </div>
-  <!-- Query Errors Tab - End -->
-
-  <!-- Query Results & Errors Content Container - Start-->
-  <div class="queryResultErrorContentContainer">
-    <!-- Query Results Content - Start-->
-    <div
-      class="tab-pane active"
-      data-bind="
-                                    id: {
-                                        href: 'queryresults' + tabId
-                                    },
-                                    visible: allResultsMetadata().length > 0 && !errors().length > 0"
-    >
-      <div class="queryResultsValue">
-        <span class="queryResults"> Results: </span> <span data-bind="text: showingDocumentsDisplayText"></span>
-        <span class="queryResultDivider"> | </span> <span> Request Charge: </span>
-        <span data-bind="text: requestChargeDisplayText"></span> <span class="queryResultDivider"> | </span>
-        <span class="queryResultNextEnable" data-bind="visible: fetchNextPageButton.enabled">
-          <a
-            data-bind="
-                        click: onFetchNextPageClick"
-          >
-            <span>Next</span> <img class="queryResultnextImg" src="/Query-Editor-Next.svg" />
-          </a>
-        </span>
-        <span class="queryResultNextDisable" data-bind="visible: !fetchNextPageButton.enabled()">
-          <span>Next</span> <img class="queryResultnextImg" src="/Query-Editor-Next-Disabled.svg" />
-        </span>
-      </div>
-      <div
-        style="height: 600px"
-        data-bind="
-                                            attr: {
-                                                id: resultsEditorId
-                                            }"
-      ></div>
-    </div>
-    <!-- Query Results Content - Start-->
-
-    <!-- Query Errors Content - Start-->
-    <div
-      class="tab-pane active"
-      data-bind="
-                                    id: {
-                                        href: 'queryerrors' + tabId
-                                    },
-                                    visible: errors().length > 0"
-    >
-      <!-- ko foreach: errors -->
-      <div style="margin-left: 17px; font-size: 12px">
-        <span data-bind="text: $data.code"></span> : <span data-bind="text: $data.message"></span>
-      </div>
-      <!-- /ko -->
-    </div>
-    <!-- Query Errors Content - End-->
-  </div>
-  <!-- Results & Errors Content Container - Endt-->
-</div>
diff --git a/src/Explorer/Tabs/MongoQueryTab.ts b/src/Explorer/Tabs/MongoQueryTab.ts
index fcf029759..53ba3271e 100644
--- a/src/Explorer/Tabs/MongoQueryTab.ts
+++ b/src/Explorer/Tabs/MongoQueryTab.ts
@@ -5,10 +5,8 @@ import QueryTab from "./QueryTab";
 import * as HeadersUtility from "../../Common/HeadersUtility";
 import { queryIterator } from "../../Common/MongoProxyClient";
 import { MinimalQueryIterator } from "../../Common/IteratorUtilities";
-import template from "./MongoQueryTab.html";
 
 export default class MongoQueryTab extends QueryTab {
-  public static readonly component = { name: "mongo-query-tab", template };
   public collection: ViewModels.Collection;
 
   constructor(options: ViewModels.QueryTabOptions) {
diff --git a/src/Explorer/Tabs/QueryTab.ts b/src/Explorer/Tabs/QueryTab.ts
index 089eaf959..b91043440 100644
--- a/src/Explorer/Tabs/QueryTab.ts
+++ b/src/Explorer/Tabs/QueryTab.ts
@@ -9,7 +9,7 @@ import * as HeadersUtility from "../../Common/HeadersUtility";
 import { Splitter, SplitterBounds, SplitterDirection } from "../../Common/Splitter";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import ExecuteQueryIcon from "../../../images/ExecuteQuery.svg";
-import { QueryUtils } from "../../Utils/QueryUtils";
+import * as QueryUtils from "../../Utils/QueryUtils";
 import SaveQueryIcon from "../../../images/save-cosmos.svg";
 
 import { MinimalQueryIterator } from "../../Common/IteratorUtilities";
diff --git a/src/Explorer/Tabs/TabsManager.html b/src/Explorer/Tabs/TabsManager.html
index deb01358d..d66a2ba33 100644
--- a/src/Explorer/Tabs/TabsManager.html
+++ b/src/Explorer/Tabs/TabsManager.html
@@ -76,10 +76,10 @@
 
   <!-- Tabs Panes -- Start -->
   <div class="tabPanesContainer">
-    <!-- ko if: activeTab && activeTab() -->
-    <div class="tabs-container" data-bind="visible: activeTab().isActive">
+    <!-- ko foreach: openedTabs -->
+    <div class="tabs-container" data-bind="visible: $data.isActive">
       <span
-        data-bind="class: activeTab().constructor.component.name, component: { name: activeTab().constructor.component.name, params: activeTab }"
+        data-bind="class: $data.constructor.component.name, component: { name: $data.constructor.component.name, params: $data }"
       ></span>
     </div>
     <!-- /ko -->
diff --git a/src/Explorer/Tree/ResourceTreeAdapter.test.ts b/src/Explorer/Tree/ResourceTreeAdapter.test.ts
index 5102149c1..e65ee1011 100644
--- a/src/Explorer/Tree/ResourceTreeAdapter.test.ts
+++ b/src/Explorer/Tree/ResourceTreeAdapter.test.ts
@@ -1,8 +1,8 @@
-import Explorer from "../Explorer";
 import * as ko from "knockout";
-import { ResourceTreeAdapter } from "./ResourceTreeAdapter";
 import * as ViewModels from "../../Contracts/ViewModels";
+import Explorer from "../Explorer";
 import TabsBase from "../Tabs/TabsBase";
+import { ResourceTreeAdapter } from "./ResourceTreeAdapter";
 
 describe("ResourceTreeAdapter", () => {
   const mockContainer = (): Explorer =>
@@ -18,7 +18,7 @@ describe("ResourceTreeAdapter", () => {
         } as TabsBase),
       },
       isNotebookEnabled: ko.observable<boolean>(true),
-      nonSystemDatabases: ko.observable<ViewModels.Database[]>([]),
+      databases: ko.observable<ViewModels.Database[]>([]),
     } as unknown) as Explorer);
 
   // TODO isDataNodeSelected needs a better design and refactor, but for now, we protect some of the code paths
diff --git a/src/Explorer/Tree/ResourceTreeAdapter.tsx b/src/Explorer/Tree/ResourceTreeAdapter.tsx
index 06a7d51d4..bb8dac7e8 100644
--- a/src/Explorer/Tree/ResourceTreeAdapter.tsx
+++ b/src/Explorer/Tree/ResourceTreeAdapter.tsx
@@ -1,39 +1,38 @@
 import * as ko from "knockout";
+import { Callout, DirectionalHint, ICalloutProps, ILinkProps, Link, Stack, Text } from "office-ui-fabric-react";
 import * as React from "react";
-import { ReactAdapter } from "../../Bindings/ReactBindingHandler";
-import { AccordionComponent, AccordionItemComponent } from "../Controls/Accordion/AccordionComponent";
-import { TreeComponent, TreeNode, TreeNodeMenuItem, TreeNodeComponent } from "../Controls/TreeComponent/TreeComponent";
-import * as ViewModels from "../../Contracts/ViewModels";
-import { NotebookContentItem, NotebookContentItemType } from "../Notebook/NotebookContentItem";
-import { ResourceTreeContextMenuButtonFactory } from "../ContextMenuButtonFactory";
-import { mostRecentActivity } from "../MostRecentActivity/MostRecentActivity";
-import CopyIcon from "../../../images/notebook/Notebook-copy.svg";
 import CosmosDBIcon from "../../../images/Azure-Cosmos-DB.svg";
-import CollectionIcon from "../../../images/tree-collection.svg";
 import DeleteIcon from "../../../images/delete.svg";
-import NotebookIcon from "../../../images/notebook/Notebook-resource.svg";
-import RefreshIcon from "../../../images/refresh-cosmos.svg";
-import NewNotebookIcon from "../../../images/notebook/Notebook-new.svg";
-import FileIcon from "../../../images/notebook/file-cosmos.svg";
-import PublishIcon from "../../../images/notebook/publish_content.svg";
-import { ArrayHashMap } from "../../Common/ArrayHashMap";
-import { NotebookUtil } from "../Notebook/NotebookUtil";
-import _ from "underscore";
-import { IPinnedRepo } from "../../Juno/JunoClient";
-import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
-import { Action, ActionModifiers, Source } from "../../Shared/Telemetry/TelemetryConstants";
-import { Areas } from "../../Common/Constants";
-import * as GitHubUtils from "../../Utils/GitHubUtils";
 import GalleryIcon from "../../../images/GalleryIcon.svg";
-import { Callout, Text, Link, DirectionalHint, Stack, ICalloutProps, ILinkProps } from "office-ui-fabric-react";
+import FileIcon from "../../../images/notebook/file-cosmos.svg";
+import CopyIcon from "../../../images/notebook/Notebook-copy.svg";
+import NewNotebookIcon from "../../../images/notebook/Notebook-new.svg";
+import NotebookIcon from "../../../images/notebook/Notebook-resource.svg";
+import PublishIcon from "../../../images/notebook/publish_content.svg";
+import RefreshIcon from "../../../images/refresh-cosmos.svg";
+import CollectionIcon from "../../../images/tree-collection.svg";
+import { ReactAdapter } from "../../Bindings/ReactBindingHandler";
+import { ArrayHashMap } from "../../Common/ArrayHashMap";
+import { Areas } from "../../Common/Constants";
+import * as DataModels from "../../Contracts/DataModels";
+import * as ViewModels from "../../Contracts/ViewModels";
+import { IPinnedRepo } from "../../Juno/JunoClient";
 import { LocalStorageUtility, StorageKey } from "../../Shared/StorageUtility";
+import { Action, ActionModifiers, Source } from "../../Shared/Telemetry/TelemetryConstants";
+import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
+import { userContext } from "../../UserContext";
+import * as GitHubUtils from "../../Utils/GitHubUtils";
+import { ResourceTreeContextMenuButtonFactory } from "../ContextMenuButtonFactory";
+import { AccordionComponent, AccordionItemComponent } from "../Controls/Accordion/AccordionComponent";
+import { TreeComponent, TreeNode, TreeNodeMenuItem } from "../Controls/TreeComponent/TreeComponent";
 import Explorer from "../Explorer";
-import UserDefinedFunction from "./UserDefinedFunction";
+import { mostRecentActivity } from "../MostRecentActivity/MostRecentActivity";
+import { NotebookContentItem, NotebookContentItemType } from "../Notebook/NotebookContentItem";
+import { NotebookUtil } from "../Notebook/NotebookUtil";
+import TabsBase from "../Tabs/TabsBase";
 import StoredProcedure from "./StoredProcedure";
 import Trigger from "./Trigger";
-import TabsBase from "../Tabs/TabsBase";
-import { userContext } from "../../UserContext";
-import * as DataModels from "../../Contracts/DataModels";
+import UserDefinedFunction from "./UserDefinedFunction";
 
 export class ResourceTreeAdapter implements ReactAdapter {
   public static readonly MyNotebooksTitle = "My Notebooks";
@@ -64,7 +63,7 @@ export class ResourceTreeAdapter implements ReactAdapter {
     this.koSubsCollectionIdMap = new ArrayHashMap();
     this.databaseCollectionIdMap = new ArrayHashMap();
 
-    this.container.nonSystemDatabases.subscribe((databases: ViewModels.Database[]) => {
+    this.container.databases.subscribe((databases: ViewModels.Database[]) => {
       // Clean up old databases
       this.cleanupDatabasesKoSubs();
 
@@ -72,7 +71,7 @@ export class ResourceTreeAdapter implements ReactAdapter {
       this.triggerRender();
     });
 
-    this.container.nonSystemDatabases().forEach((database: ViewModels.Database) => this.watchDatabase(database));
+    this.container.databases().forEach((database: ViewModels.Database) => this.watchDatabase(database));
     this.triggerRender();
   }
 
@@ -190,7 +189,7 @@ export class ResourceTreeAdapter implements ReactAdapter {
   }
 
   private buildDataTree(): TreeNode {
-    const databaseTreeNodes: TreeNode[] = this.container.nonSystemDatabases().map((database: ViewModels.Database) => {
+    const databaseTreeNodes: TreeNode[] = this.container.databases().map((database: ViewModels.Database) => {
       const databaseNode: TreeNode = {
         label: database.id(),
         iconSrc: CosmosDBIcon,
diff --git a/src/Libs/is-integer-polyfill.js b/src/Libs/is-integer-polyfill.js
deleted file mode 100644
index 6370244e4..000000000
--- a/src/Libs/is-integer-polyfill.js
+++ /dev/null
@@ -1,5 +0,0 @@
-Number.isInteger =
-  Number.isInteger ||
-  function(value) {
-    return typeof value === "number" && isFinite(value) && Math.floor(value) === value;
-  };
diff --git a/src/Localization/en/Common.json b/src/Localization/en/Common.json
new file mode 100644
index 000000000..0e58fa4d4
--- /dev/null
+++ b/src/Localization/en/Common.json
@@ -0,0 +1,5 @@
+{
+    "Save": "Save",
+    "Discard": "Discard",
+    "Refresh": "Refesh"
+}
\ No newline at end of file
diff --git a/src/Localization/en/SelfServeExample.json b/src/Localization/en/SelfServeExample.json
new file mode 100644
index 000000000..2d28615c7
--- /dev/null
+++ b/src/Localization/en/SelfServeExample.json
@@ -0,0 +1,31 @@
+{
+    "NorthCentralUS": "North Central US",
+    "WestUS": "West US",
+    "EastUS2": "East US 2",
+    "Current Region": "Current Region",
+    "RegionDropdownInfo": "More regions can be added in the future.",
+    "RegionsAndAccountNameValidationError": "Regions and account name should not be empty.",
+    "DbThroughputValidationError": "Please update throughput for database.",
+    "DescriptionLabel": "Description",
+    "DescriptionText": "This class sets collection and database throughput.",
+    "DecriptionLinkText": "Click here for more information",
+    "Regions": "Regions",
+    "RegionsPlaceholder": "Select a region",
+    "Enable Logging": "Enable Logging",
+    "Enable": "Enable",
+    "Disable": "Disable",
+    "Account Name": "Account Name",
+    "AccountNamePlaceHolder": "Enter the account name",
+    "Collection Throughput": "Collection Throughput",
+    "Enable DB level throughput": "Enable Database Level Throughput",
+    "Database Throughput": "Database Throughput",
+    "UpdateInProgressMessage": "Data is being updated",
+    "UpdateCompletedMessageTitle": "Update succeeded",
+    "UpdateCompletedMessageText": "Data update completed.",
+    "SubmissionMessageSuccessTitle": "Update started",
+    "SubmissionMessageForNewRegionText": "Data update started. Region changed.",
+    "SubmissionMessageForSameRegionText": "Data update started. Region not changed.",
+    "SubmissionMessageErrorTitle": "Data update failed",
+    "SubmissionMessageErrorText": "Data update failed because of errors.",
+    "OnSaveFailureMessage": "Data save operation not currently permitted."
+}
\ No newline at end of file
diff --git a/src/Localization/en/SqlX.json b/src/Localization/en/SqlX.json
new file mode 100644
index 000000000..465cba248
--- /dev/null
+++ b/src/Localization/en/SqlX.json
@@ -0,0 +1,52 @@
+{
+    "DedicatedGatewayDescription": "Provision a dedicated gateway cluster for your Azure Cosmos DB account. A dedicated gateway is compute that is a front-end to data in your Azure Cosmos DB account. Your dedicated gateway automatically includes the integrated cache, which can improve read performance.",
+    "DedicatedGateway": "Dedicated Gateway",
+    "Enable": "Enable",
+    "Disable": "Disable",
+    "LearnAboutDedicatedGateway": "Learn more about dedicated gateway.",
+    "DeprovisioningDetailsText": "Learn more about deprovisioning the dedicated gateway.",
+    "DedicatedGatewayPricing": "Learn more about dedicated gateway pricing.",
+    "SKUs": "SKUs",
+    "SKUsPlaceHolder": "Select SKUs",
+    "NumberOfInstances": "Number of instances",
+    "CosmosD4s": "Cosmos.D4s (General Purpose Cosmos Compute with 4 vCPUs, 16 GB Memory)",
+    "CosmosD8s": "Cosmos.D8s (General Purpose Cosmos Compute with 8 vCPUs, 32 GB Memory)",
+    "CosmosD16s": "Cosmos.D16s (General Purpose Cosmos Compute with 16 vCPUs, 64 GB Memory)",
+    "CosmosD32s": "Cosmos.D32s (General Purpose Cosmos Compute with 32 vCPUs, 128 GB Memory)",
+    "CreateMessage": "Dedicated gateway resource is being created.",
+    "CreateInitializeTitle": "Provisioning resource",
+    "CreateInitializeMessage": "Dedicated gateway resource will be provisioned.",
+    "CreateSuccessTitle": "Resource provisioned",
+    "CreateSuccesseMessage": "Dedicated gateway resource provisioned.",
+    "CreateFailureTitle": "Failed to provision resource",
+    "CreateFailureMessage": "Dedicated gateway resource provisioning failed.",
+    "UpdateMessage": "Dedicated gateway resource is being updated.",
+    "UpdateInitializeTitle": "Updating resource",
+    "UpdateInitializeMessage": "Dedicated gateway resource will be updated.",
+    "UpdateSuccessTitle": "Resource updated",
+    "UpdateSuccesseMessage": "Dedicated gateway resource updated.",
+    "UpdateFailureTitle": "Failed to update resource",
+    "UpdateFailureMessage": "Dedicated gateway resource updation failed.",
+    "DeleteMessage": "Dedicated gateway resource is being deleted.",
+    "DeleteInitializeTitle": "Deleting resource",
+    "DeleteInitializeMessage": "Dedicated gateway resource will be deleted.",
+    "DeleteSuccessTitle": "Resource deleted",
+    "DeleteSuccesseMessage": "Dedicated gateway resource deleted.",
+    "DeleteFailureTitle": "Failed to delete resource",
+    "DeleteFailureMessage": "Dedicated gateway resource deletion failed.",
+    "CannotSave": "Cannot save the changes to the Dedicated gateway resource at the moment.",
+    "DedicatedGatewayEndpoint": "Dedicated gatewayEndpoint",
+    "NoValue": "",
+    "SKUDetails": "SKU Details:",
+    "CosmosD4Details": "General Purpose Cosmos Compute with 4 vCPUs, 16 GB Memory",
+    "CosmosD8Details": "General Purpose Cosmos Compute with 8 vCPUs, 32 GB Memory",
+    "CosmosD16Details": "General Purpose Cosmos Compute with 16 vCPUs, 64 GB Memory",
+    "CosmosD32Details": "General Purpose Cosmos Compute with 32 vCPUs, 128 GB Memory",
+    "Cost": "Cost",
+    "CostText": "Hourly cost of the dedicated gateway resource depends on the SKU selection, number of instances per region, and number of regions.",
+    "ConnectionString": "Connection String",
+    "ConnectionStringText": "To use the dedicated gateway, use the connection string shown in ",
+    "KeysBlade": "the keys blade",
+    "WarningBannerOnUpdate": "Adding or modifying dedicated gateway instances may affect your bill.",
+    "WarningBannerOnDelete": "After deprovisioning the dedicated gateway, you must update any applications using the old dedicated gateway connection string."
+}
\ No newline at end of file
diff --git a/src/Localization/en/translations.json b/src/Localization/en/translations.json
deleted file mode 100644
index 44d4506cd..000000000
--- a/src/Localization/en/translations.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-    "translations": {
-        "Common": {
-            "Save": "Save",
-            "Discard": "Discard",
-            "Refresh": "Refesh"
-        },
-        "SelfServeExample": {
-            "North Central US": "North Central US",
-            "West US": "West US",
-            "East US 2": "East US 2",
-            "Current Region": "Current Region",
-            "RegionDropdownInfo": "More regions can be added in the future.",
-            "RegionsAndAccountNameValidationError": "Regions and account name should not be empty.",
-            "DbThroughputValidationError": "Please update throughput for database.",
-            "DescriptionLabel": "Description",
-            "DescriptionText": "This class sets collection and database throughput.",
-            "DecriptionLinkText": "Click here for more information",
-            "Regions": "Regions",
-            "RegionsPlaceholder": "Select a region",
-            "Enable Logging": "Enable Logging",
-            "Enable": "Enable",
-            "Disable": "Disable",
-            "Account Name": "Account Name",
-            "AccountNamePlaceHolder": "Enter the account name",
-            "Collection Throughput": "Collection Throughput",
-            "Enable DB level throughput": "Enable Database Level Throughput",
-            "Database Throughput": "Database Throughput",
-            "UpdateInProgressMessage": "Data is being updated",
-            "UpdateCompletedMessageTitle": "Update succeeded",
-            "UpdateCompletedMessageText": "Data update completed.",
-            "SubmissionMessageSuccessTitle": "Update started",
-            "SubmissionMessageForNewRegionText": "Data update started. Region changed.",
-            "SubmissionMessageForSameRegionText": "Data update started. Region not changed.",
-            "SubmissionMessageErrorTitle": "Data update failed",
-            "SubmissionMessageErrorText": "Data update failed because of errors.",
-            "OnSaveFailureMessage": "Data save operation not currently permitted."
-        },
-        "SqlX": {
-            "DedicatedGatewayDescription": "Provision a dedicated gateway cluster for your Azure Cosmos DB account. A dedicated gateway is compute that is a front-end to data in your Azure Cosmos DB account. Your dedicated gateway automatically includes the integrated cache, which can improve read performance. ",
-            "DedicatedGateway": "Dedicated Gateway",
-            "Enable": "Enable",
-            "Disable": "Disable",
-            "LearnAboutDedicatedGateway": "Learn more about dedicated gateway.",
-            "DeprovisioningDetailsText": "Learn more about deprovisioning the dedicated gateway.",
-            "DedicatedGatewayPricing": "Learn more about dedicated gateway pricing",
-            "SKUs": "SKUs",
-            "SKUsPlaceHolder": "Select SKUs",
-            "NumberOfInstances": "Number of instances",
-            "CosmosD4s": "Cosmos.D4s (General Purpose Cosmos Compute with 4 vCPUs, 16 GB Memory)",
-            "CosmosD8s": "Cosmos.D8s (General Purpose Cosmos Compute with 8 vCPUs, 32 GB Memory)",
-            "CosmosD16s": "Cosmos.D16s (General Purpose Cosmos Compute with 16 vCPUs, 64 GB Memory)",
-            "CosmosD32s": "Cosmos.D32s (General Purpose Cosmos Compute with 32 vCPUs, 128 GB Memory)",
-            "CreateMessage": "Dedicated gateway resource is being created.",
-            "CreateInitializeTitle": "Provisioning resource",
-            "CreateInitializeMessage": "Dedicated gateway resource will be provisioned.",
-            "CreateSuccessTitle": "Resource provisioned",
-            "CreateSuccesseMessage": "Dedicated gateway resource provisioned.",
-            "CreateFailureTitle": "Failed to provision resource",
-            "CreateFailureMessage": "Dedicated gateway resource provisioning failed.",
-            "UpdateMessage": "Dedicated gateway resource is being updated.",
-            "UpdateInitializeTitle": "Updating resource",
-            "UpdateInitializeMessage": "Dedicated gateway resource will be updated.",
-            "UpdateSuccessTitle": "Resource updated",
-            "UpdateSuccesseMessage": "Dedicated gateway resource updated.",
-            "UpdateFailureTitle": "Failed to update resource",
-            "UpdateFailureMessage": "Dedicated gateway resource updation failed.",
-            "DeleteMessage": "Dedicated gateway resource is being deleted.",
-            "DeleteInitializeTitle": "Deleting resource",
-            "DeleteInitializeMessage": "Dedicated gateway resource will be deleted.",
-            "DeleteSuccessTitle": "Resource deleted",
-            "DeleteSuccesseMessage": "Dedicated gateway resource deleted.",
-            "DeleteFailureTitle": "Failed to delete resource",
-            "DeleteFailureMessage": "Dedicated gateway resource deletion failed.",
-            "CannotSave": "Cannot save the changes to the Dedicated gateway resource at the moment",
-            "DedicatedGatewayEndpoint": "Dedicated gatewayEndpoint",
-            "NoValue": "",
-            "SKUDetails": "SKU Details: ",
-            "CosmosD4Details": "General Purpose Cosmos Compute with 4 vCPUs, 16 GB Memory",
-            "CosmosD8Details": "General Purpose Cosmos Compute with 8 vCPUs, 32 GB Memory",
-            "CosmosD16Details": "General Purpose Cosmos Compute with 16 vCPUs, 64 GB Memory",
-            "CosmosD32Details": "General Purpose Cosmos Compute with 32 vCPUs, 128 GB Memory",
-            "Cost": "Cost",
-            "CostText": "Hourly cost of the dedicated gateway resource depends on the SKU selection, number of instances per region, and number of regions.",
-            "ConnectionString": "Connection String",
-            "ConnectionStringText": "To use the dedicated gateway, use the connection string shown in ",
-            "KeysBlade": "the keys blade",
-            "WarningBannerOnUpdate": "Adding or modifying dedicated gateway instances may affect your bill.",
-            "WarningBannerOnDelete": "After deprovisioning the dedicated gateway, you must update any applications using the old dedicated gateway connection string."
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Main.tsx b/src/Main.tsx
index dd9780c05..5827769e8 100644
--- a/src/Main.tsx
+++ b/src/Main.tsx
@@ -1,18 +1,8 @@
 // CSS Dependencies
-import "abort-controller/polyfill";
-import "babel-polyfill";
 import "bootstrap/dist/css/bootstrap.css";
-import "es6-object-assign/auto";
-import "es6-symbol/implement";
-import "object.entries/auto";
 import { initializeIcons } from "office-ui-fabric-react/lib/Icons";
-import "promise-polyfill/src/polyfill";
-import "promise.prototype.finally/auto";
 import React, { useState } from "react";
 import ReactDOM from "react-dom";
-import "url-polyfill/url-polyfill.min";
-import "webcrypto-liner/build/webcrypto-liner.shim.min";
-import "whatwg-fetch";
 import "../externals/jquery-ui.min.css";
 import "../externals/jquery-ui.min.js";
 import "../externals/jquery-ui.structure.min.css";
@@ -64,7 +54,6 @@ import { useConfig } from "./hooks/useConfig";
 import { useKnockoutExplorer } from "./hooks/useKnockoutExplorer";
 import { useSidePanel } from "./hooks/useSidePanel";
 import { KOCommentEnd, KOCommentIfStart } from "./koComment";
-import "./Libs/is-integer-polyfill";
 import "./Libs/jquery";
 import "./Shared/appInsights";
 import { userContext } from "./UserContext";
diff --git a/src/Platform/Hosted/extractFeatures.ts b/src/Platform/Hosted/extractFeatures.ts
index 4636c947e..eda8458ff 100644
--- a/src/Platform/Hosted/extractFeatures.ts
+++ b/src/Platform/Hosted/extractFeatures.ts
@@ -23,11 +23,18 @@ export type Features = {
   readonly ttl90Days: boolean;
 };
 
-export function extractFeatures(params?: URLSearchParams): Features {
-  params = params || new URLSearchParams(window.location.search);
+export function extractFeatures(given = new URLSearchParams()): Features {
   const downcased = new URLSearchParams();
-  params.forEach((value, key) => downcased.append(key.toLocaleLowerCase(), value));
-  const get = (key: string) => downcased.get("feature." + key.toLocaleLowerCase()) ?? undefined;
+  const set = (value: string, key: string) => downcased.set(key.toLowerCase(), value);
+  const get = (key: string) => downcased.get("feature." + key) ?? undefined;
+
+  try {
+    new URLSearchParams(window.parent.location.search).forEach(set);
+  } catch {
+    //
+  } finally {
+    given.forEach(set);
+  }
 
   return {
     canExceedMaximumValue: "true" === get("canexceedmaximumvalue"),
diff --git a/src/SelfServe/Example/SelfServeExample.tsx b/src/SelfServe/Example/SelfServeExample.tsx
index df994d0a7..a533a26f7 100644
--- a/src/SelfServe/Example/SelfServeExample.tsx
+++ b/src/SelfServe/Example/SelfServeExample.tsx
@@ -23,9 +23,9 @@ import {
 } from "./SelfServeExample.rp";
 
 const regionDropdownItems: ChoiceItem[] = [
-  { label: "North Central US", key: Regions.NorthCentralUS },
-  { label: "West US", key: Regions.WestUS },
-  { label: "East US 2", key: Regions.EastUS2 },
+  { labelTKey: "NorthCentralUS", key: Regions.NorthCentralUS },
+  { labelTKey: "WestUS", key: Regions.WestUS },
+  { labelTKey: "EastUS2", key: Regions.EastUS2 },
 ];
 
 const regionDropdownInfo: Info = {
diff --git a/src/SelfServe/SelfServe.tsx b/src/SelfServe/SelfServe.tsx
index 4ad49b2f2..062d07289 100644
--- a/src/SelfServe/SelfServe.tsx
+++ b/src/SelfServe/SelfServe.tsx
@@ -2,10 +2,12 @@ import { Spinner, SpinnerSize } from "office-ui-fabric-react";
 import { initializeIcons } from "office-ui-fabric-react/lib/Icons";
 import * as React from "react";
 import ReactDOM from "react-dom";
+import { withTranslation } from "react-i18next";
 import { normalizeArmEndpoint } from "../Common/EnvironmentUtility";
 import { sendReadyMessage } from "../Common/MessageHandler";
 import { configContext, updateConfigContext } from "../ConfigContext";
 import { SelfServeFrameInputs } from "../Contracts/ViewModels";
+import i18n from "../i18n";
 import { updateUserContext } from "../UserContext";
 import { isInvalidParentFrameOrigin } from "../Utils/MessageValidation";
 import "./SelfServe.less";
@@ -14,14 +16,35 @@ import { SelfServeDescriptor } from "./SelfServeTypes";
 import { SelfServeType } from "./SelfServeUtils";
 initializeIcons();
 
+const loadTranslationFile = async (className: string): Promise<void> => {
+  const language = i18n.languages[0];
+  const fileName = `${className}.json`;
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  let translations: any;
+  try {
+    translations = await import(`../Localization/${language}/${fileName}`);
+  } catch (e) {
+    translations = await import(`../Localization/en/${fileName}`);
+  }
+  i18n.addResourceBundle(language, className, translations.default, true);
+};
+
+const loadTranslations = async (className: string): Promise<void> => {
+  await loadTranslationFile("Common");
+  await loadTranslationFile(className);
+};
+
 const getDescriptor = async (selfServeType: SelfServeType): Promise<SelfServeDescriptor> => {
   switch (selfServeType) {
     case SelfServeType.example: {
       const SelfServeExample = await import(/* webpackChunkName: "SelfServeExample" */ "./Example/SelfServeExample");
+      await loadTranslations(SelfServeExample.default.name);
       return new SelfServeExample.default().toSelfServeDescriptor();
     }
     case SelfServeType.sqlx: {
       const SqlX = await import(/* webpackChunkName: "SqlX" */ "./SqlX/SqlX");
+      await loadTranslations(SqlX.default.name);
       return new SqlX.default().toSelfServeDescriptor();
     }
     default:
@@ -33,7 +56,8 @@ const renderComponent = (selfServeDescriptor: SelfServeDescriptor): JSX.Element
   if (!selfServeDescriptor) {
     return <h1>Invalid self serve type!</h1>;
   }
-  return <SelfServeComponent descriptor={selfServeDescriptor} />;
+  const SelfServeComponentTranslated = withTranslation()(SelfServeComponent);
+  return <SelfServeComponentTranslated descriptor={selfServeDescriptor} />;
 };
 
 const renderSpinner = (): JSX.Element => {
diff --git a/src/SelfServe/SelfServeComponent.test.tsx b/src/SelfServe/SelfServeComponent.test.tsx
index 80ec112af..81bbb905b 100644
--- a/src/SelfServe/SelfServeComponent.test.tsx
+++ b/src/SelfServe/SelfServeComponent.test.tsx
@@ -1,5 +1,5 @@
-import React from "react";
 import { shallow } from "enzyme";
+import React from "react";
 import { SelfServeComponent, SelfServeComponentState } from "./SelfServeComponent";
 import { NumberUiType, OnSaveResult, SelfServeDescriptor, SmartUiInput } from "./SelfServeTypes";
 
@@ -87,9 +87,9 @@ describe("SelfServeComponent", () => {
             dataFieldName: "database",
             type: "object",
             choices: [
-              { label: "Database 1", key: "db1" },
-              { label: "Database 2", key: "db2" },
-              { label: "Database 3", key: "db3" },
+              { labelTKey: "Database 1", key: "db1" },
+              { labelTKey: "Database 2", key: "db2" },
+              { labelTKey: "Database 3", key: "db3" },
             ],
             defaultKey: "db2",
           },
@@ -106,7 +106,9 @@ describe("SelfServeComponent", () => {
   };
 
   it("should render and honor save, discard, refresh actions", async () => {
-    const wrapper = shallow(<SelfServeComponent descriptor={exampleData} />);
+    const wrapper = shallow(
+      <SelfServeComponent descriptor={exampleData} t={undefined} i18n={undefined} tReady={undefined} />
+    );
     await new Promise((resolve) => setTimeout(resolve, 0));
     expect(wrapper).toMatchSnapshot();
 
@@ -158,7 +160,9 @@ describe("SelfServeComponent", () => {
   });
 
   it("getResolvedValue", async () => {
-    const wrapper = shallow(<SelfServeComponent descriptor={exampleData} />);
+    const wrapper = shallow(
+      <SelfServeComponent descriptor={exampleData} t={undefined} i18n={undefined} tReady={undefined} />
+    );
     await new Promise((resolve) => setTimeout(resolve, 0));
     const selfServeComponent = wrapper.instance() as SelfServeComponent;
 
@@ -179,7 +183,9 @@ describe("SelfServeComponent", () => {
 
   it("message bar and spinner snapshots", async () => {
     const newDescriptor = { ...exampleData, onRefresh: onRefreshIsUpdatingMock };
-    let wrapper = shallow(<SelfServeComponent descriptor={newDescriptor} />);
+    let wrapper = shallow(
+      <SelfServeComponent descriptor={newDescriptor} t={undefined} i18n={undefined} tReady={undefined} />
+    );
     await new Promise((resolve) => setTimeout(resolve, 0));
     let selfServeComponent = wrapper.instance() as SelfServeComponent;
     selfServeComponent.onSaveButtonClick();
@@ -187,7 +193,9 @@ describe("SelfServeComponent", () => {
     expect(wrapper).toMatchSnapshot();
 
     newDescriptor.onRefresh = onRefreshMock;
-    wrapper = shallow(<SelfServeComponent descriptor={newDescriptor} />);
+    wrapper = shallow(
+      <SelfServeComponent descriptor={newDescriptor} t={undefined} i18n={undefined} tReady={undefined} />
+    );
     await new Promise((resolve) => setTimeout(resolve, 0));
     selfServeComponent = wrapper.instance() as SelfServeComponent;
     selfServeComponent.onSaveButtonClick();
diff --git a/src/SelfServe/SelfServeComponent.tsx b/src/SelfServe/SelfServeComponent.tsx
index 649dc2bdc..0de97c8bd 100644
--- a/src/SelfServe/SelfServeComponent.tsx
+++ b/src/SelfServe/SelfServeComponent.tsx
@@ -8,15 +8,15 @@ import {
   Spinner,
   SpinnerSize,
   Stack,
+  Text,
 } from "office-ui-fabric-react";
 import promiseRetry, { AbortError } from "p-retry";
 import React from "react";
-import { Translation } from "react-i18next";
+import { WithTranslation } from "react-i18next";
 import * as _ from "underscore";
 import { sendMessage } from "../Common/MessageHandler";
 import { SelfServeMessageTypes } from "../Contracts/SelfServeContracts";
 import { SmartUiComponent, SmartUiDescriptor } from "../Explorer/Controls/SmartUi/SmartUiComponent";
-import "../i18n";
 import { commandBarItemStyles, commandBarStyles, containerStackTokens, separatorStyles } from "./SelfServeStyles";
 import {
   AnyDisplay,
@@ -57,7 +57,7 @@ interface PortalNotificationContent {
   };
 }
 
-export interface SelfServeComponentProps {
+export interface SelfServeComponentProps extends WithTranslation {
   descriptor: SelfServeDescriptor;
 }
 
@@ -108,6 +108,9 @@ export class SelfServeComponent extends React.Component<SelfServeComponentProps,
       this.retryIntervalInMs = SelfServeComponent.defaultRetryIntervalInMs;
     }
     this.retryOptions = { forever: true, maxTimeout: this.retryIntervalInMs, minTimeout: this.retryIntervalInMs };
+
+    // translation function passed to SelfServeComponent
+    this.translationFunction = this.props.t;
   }
 
   private onError = (hasErrors: boolean): void => {
@@ -391,8 +394,8 @@ export class SelfServeComponent extends React.Component<SelfServeComponentProps,
     return this.getTranslation(key, "Common");
   };
 
-  private getTranslation = (messageKey: string, prefix = `${this.smartUiGeneratorClassName}`): string => {
-    const translationKey = `${prefix}.${messageKey}`;
+  private getTranslation = (messageKey: string, namespace = `${this.smartUiGeneratorClassName}`): string => {
+    const translationKey = `${namespace}:${messageKey}`;
     const translation = this.translationFunction ? this.translationFunction(translationKey) : messageKey;
     if (translation === translationKey) {
       return messageKey;
@@ -441,53 +444,45 @@ export class SelfServeComponent extends React.Component<SelfServeComponentProps,
 
   public render(): JSX.Element {
     if (this.state.compileErrorMessage) {
-      return <MessageBar messageBarType={MessageBarType.error}>{this.state.compileErrorMessage}</MessageBar>;
+      return (
+        <MessageBar messageBarType={MessageBarType.error}>
+          <Text>{this.state.compileErrorMessage}</Text>
+        </MessageBar>
+      );
     }
     return (
-      <Translation>
-        {(translate) => {
-          if (!this.translationFunction) {
-            this.translationFunction = translate;
-          }
-
-          return (
-            <div style={{ overflowX: "auto" }}>
-              <Stack tokens={containerStackTokens}>
-                <Stack.Item>
-                  <CommandBar styles={commandBarStyles} items={this.getCommandBarItems()} />
-                  <Separator styles={separatorStyles} />
-                </Stack.Item>
-                {this.state.isInitializing ? (
-                  <Spinner size={SpinnerSize.large} />
-                ) : (
-                  <>
-                    {this.state.notification && (
-                      <MessageBar
-                        messageBarType={this.state.notification.type}
-                        onDismiss={
-                          this.state.notification.isCancellable
-                            ? () => this.setState({ notification: undefined })
-                            : undefined
-                        }
-                      >
-                        {this.state.notification.message}
-                      </MessageBar>
-                    )}
-                    <SmartUiComponent
-                      disabled={this.state.refreshResult?.isUpdateInProgress || this.state.isSaving}
-                      descriptor={this.state.root as SmartUiDescriptor}
-                      currentValues={this.state.currentValues}
-                      onInputChange={this.onInputChange}
-                      onError={this.onError}
-                      getTranslation={this.getTranslation}
-                    />
-                  </>
-                )}
-              </Stack>
-            </div>
-          );
-        }}
-      </Translation>
+      <div style={{ overflowX: "auto" }}>
+        <Stack tokens={containerStackTokens}>
+          <Stack.Item>
+            <CommandBar styles={commandBarStyles} items={this.getCommandBarItems()} />
+            <Separator styles={separatorStyles} />
+          </Stack.Item>
+          {this.state.isInitializing ? (
+            <Spinner size={SpinnerSize.large} />
+          ) : (
+            <>
+              {this.state.notification && (
+                <MessageBar
+                  messageBarType={this.state.notification.type}
+                  onDismiss={
+                    this.state.notification.isCancellable ? () => this.setState({ notification: undefined }) : undefined
+                  }
+                >
+                  <Text>{this.state.notification.message}</Text>
+                </MessageBar>
+              )}
+              <SmartUiComponent
+                disabled={this.state.refreshResult?.isUpdateInProgress || this.state.isSaving}
+                descriptor={this.state.root as SmartUiDescriptor}
+                currentValues={this.state.currentValues}
+                onInputChange={this.onInputChange}
+                onError={this.onError}
+                getTranslation={this.getTranslation}
+              />
+            </>
+          )}
+        </Stack>
+      </div>
     );
   }
 }
diff --git a/src/SelfServe/SelfServeTelemetryProcessor.ts b/src/SelfServe/SelfServeTelemetryProcessor.ts
new file mode 100644
index 000000000..f26b05a1e
--- /dev/null
+++ b/src/SelfServe/SelfServeTelemetryProcessor.ts
@@ -0,0 +1,69 @@
+import { sendMessage } from "../Common/MessageHandler";
+import { configContext } from "../ConfigContext";
+import { SelfServeMessageTypes } from "../Contracts/SelfServeContracts";
+import { appInsights } from "../Shared/appInsights";
+import { Action, ActionModifiers } from "../Shared/Telemetry/TelemetryConstants";
+import { userContext } from "../UserContext";
+import { SelfServeTelemetryMessage } from "./SelfServeTypes";
+
+const action = Action.SelfServe;
+
+export const trace = (data: SelfServeTelemetryMessage): void => {
+  sendSelfServeTelemetryMessage(ActionModifiers.Mark, data);
+  appInsights.trackEvent({ name: Action[action] }, decorateData(data, ActionModifiers.Mark));
+};
+
+export const traceStart = (data: SelfServeTelemetryMessage): number => {
+  const timestamp: number = Date.now();
+  sendSelfServeTelemetryMessage(ActionModifiers.Start, data);
+  appInsights.startTrackEvent(Action[action]);
+  return timestamp;
+};
+
+export const traceSuccess = (data: SelfServeTelemetryMessage, timestamp?: number): void => {
+  sendSelfServeTelemetryMessage(ActionModifiers.Success, data, timestamp || Date.now());
+  appInsights.stopTrackEvent(Action[action], decorateData(data, ActionModifiers.Success));
+};
+
+export const traceFailure = (data: SelfServeTelemetryMessage, timestamp?: number): void => {
+  sendSelfServeTelemetryMessage(ActionModifiers.Failed, data, timestamp || Date.now());
+  appInsights.stopTrackEvent(Action[action], decorateData(data, ActionModifiers.Failed));
+};
+
+export const traceCancel = (data: SelfServeTelemetryMessage, timestamp?: number): void => {
+  sendSelfServeTelemetryMessage(ActionModifiers.Cancel, data, timestamp || Date.now());
+  appInsights.stopTrackEvent(Action[action], decorateData(data, ActionModifiers.Cancel));
+};
+
+const sendSelfServeTelemetryMessage = (
+  actionModifier: string,
+  data: SelfServeTelemetryMessage,
+  timeStamp?: number
+): void => {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const dataToSend: any = {
+    type: SelfServeMessageTypes.TelemetryInfo,
+    data: {
+      action: Action[action],
+      actionModifier: actionModifier,
+      data: JSON.stringify(decorateData(data)),
+    },
+  };
+  if (timeStamp) {
+    dataToSend.data.timeStamp = timeStamp;
+  }
+  sendMessage(dataToSend);
+};
+
+const decorateData = (data: SelfServeTelemetryMessage, actionModifier?: string) => {
+  return {
+    databaseAccountName: userContext.databaseAccount?.name,
+    defaultExperience: userContext.defaultExperience,
+    authType: userContext.authType,
+    subscriptionId: userContext.subscriptionId,
+    platform: configContext.platform,
+    env: process.env.NODE_ENV,
+    actionModifier,
+    ...data,
+  } as { [key: string]: string };
+};
diff --git a/src/SelfServe/SelfServeTypes.ts b/src/SelfServe/SelfServeTypes.ts
index 611d19364..a86b74c04 100644
--- a/src/SelfServe/SelfServeTypes.ts
+++ b/src/SelfServe/SelfServeTypes.ts
@@ -98,7 +98,7 @@ export enum NumberUiType {
   Slider = "Slider",
 }
 
-export type ChoiceItem = { label: string; key: string };
+export type ChoiceItem = { labelTKey: string; key: string };
 
 export type InputType = number | string | boolean | ChoiceItem | Description;
 
@@ -157,3 +157,9 @@ export interface RefreshResult {
 export interface RefreshParams {
   retryIntervalInMs: number;
 }
+
+export interface SelfServeTelemetryMessage {
+  selfServeClassName: string;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  data?: any;
+}
diff --git a/src/SelfServe/SelfServeUtils.test.tsx b/src/SelfServe/SelfServeUtils.test.tsx
index e1fe1a3f8..0efe7bd5f 100644
--- a/src/SelfServe/SelfServeUtils.test.tsx
+++ b/src/SelfServe/SelfServeUtils.test.tsx
@@ -131,9 +131,9 @@ describe("SelfServeUtils", () => {
           type: "object",
           labelTKey: "Regions",
           choices: [
-            { label: "South West US", key: "SWUS" },
-            { label: "North Central US", key: "NCUS" },
-            { label: "East US 2", key: "EUS2" },
+            { labelTKey: "South West US", key: "SWUS" },
+            { labelTKey: "North Central US", key: "NCUS" },
+            { labelTKey: "East US 2", key: "EUS2" },
           ],
         },
       ],
@@ -238,9 +238,9 @@ describe("SelfServeUtils", () => {
               type: "object",
               labelTKey: "Regions",
               choices: [
-                { label: "South West US", key: "SWUS" },
-                { label: "North Central US", key: "NCUS" },
-                { label: "East US 2", key: "EUS2" },
+                { labelTKey: "South West US", key: "SWUS" },
+                { labelTKey: "North Central US", key: "NCUS" },
+                { labelTKey: "East US 2", key: "EUS2" },
               ],
             },
             children: [] as Node[],
diff --git a/src/SelfServe/SelfServeUtils.tsx b/src/SelfServe/SelfServeUtils.tsx
index 8d1cec9a3..8106153a2 100644
--- a/src/SelfServe/SelfServeUtils.tsx
+++ b/src/SelfServe/SelfServeUtils.tsx
@@ -195,5 +195,5 @@ export const generateBladeLink = (blade: BladeType): string => {
   const subscriptionId = userContext.subscriptionId;
   const resourceGroupName = userContext.resourceGroup;
   const databaseAccountName = userContext.databaseAccount.name;
-  return `https://portal.azure.com/#@microsoft.onmicrosoft.com/resource/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDb/databaseAccounts/${databaseAccountName}/${blade}`;
+  return `${document.referrer}#@microsoft.onmicrosoft.com/resource/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDb/databaseAccounts/${databaseAccountName}/${blade}`;
 };
diff --git a/src/SelfServe/SqlX/SqlX.tsx b/src/SelfServe/SqlX/SqlX.tsx
index e8308b651..41d855fee 100644
--- a/src/SelfServe/SqlX/SqlX.tsx
+++ b/src/SelfServe/SqlX/SqlX.tsx
@@ -1,4 +1,5 @@
 import { IsDisplayable, OnChange, RefreshOptions, Values } from "../Decorators";
+import { trace } from "../SelfServeTelemetryProcessor";
 import {
   ChoiceItem,
   Description,
@@ -147,10 +148,10 @@ const onEnableDedicatedGatewayChange = (
 };
 
 const skuDropDownItems: ChoiceItem[] = [
-  { label: "CosmosD4s", key: CosmosD4s },
-  { label: "CosmosD8s", key: CosmosD8s },
-  { label: "CosmosD16s", key: CosmosD16s },
-  { label: "CosmosD32s", key: CosmosD32s },
+  { labelTKey: "CosmosD4s", key: CosmosD4s },
+  { labelTKey: "CosmosD8s", key: CosmosD8s },
+  { labelTKey: "CosmosD16s", key: CosmosD16s },
+  { labelTKey: "CosmosD32s", key: CosmosD32s },
 ];
 
 const getSkus = async (): Promise<ChoiceItem[]> => {
@@ -176,6 +177,8 @@ export default class SqlX extends SelfServeBaseClass {
     currentValues: Map<string, SmartUiInput>,
     baselineValues: Map<string, SmartUiInput>
   ): Promise<OnSaveResult> => {
+    trace({ selfServeClassName: "SqlX" });
+
     const dedicatedGatewayCurrentlyEnabled = currentValues.get("enableDedicatedGateway")?.value as boolean;
     const dedicatedGatewayOriginallyEnabled = baselineValues.get("enableDedicatedGateway")?.value as boolean;
 
diff --git a/src/SelfServe/__snapshots__/SelfServeComponent.test.tsx.snap b/src/SelfServe/__snapshots__/SelfServeComponent.test.tsx.snap
index 09c5ae177..1ba9afb95 100644
--- a/src/SelfServe/__snapshots__/SelfServeComponent.test.tsx.snap
+++ b/src/SelfServe/__snapshots__/SelfServeComponent.test.tsx.snap
@@ -1,33 +1,1050 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`SelfServeComponent message bar and spinner snapshots 1`] = `
-<Translation>
-  <Component />
-</Translation>
+<div
+  style={
+    Object {
+      "overflowX": "auto",
+    }
+  }
+>
+  <Stack
+    tokens={
+      Object {
+        "childrenGap": 5,
+        "padding": 10,
+      }
+    }
+  >
+    <StackItem>
+      <StyledCommandBarBase
+        items={
+          Array [
+            Object {
+              "disabled": true,
+              "iconProps": Object {
+                "iconName": "Save",
+              },
+              "key": "save",
+              "onClick": [Function],
+              "text": "Save",
+            },
+            Object {
+              "buttonStyles": Object {
+                "root": Object {
+                  "paddingLeft": 20,
+                },
+              },
+              "disabled": true,
+              "iconProps": Object {
+                "iconName": "Undo",
+              },
+              "key": "discard",
+              "onClick": [Function],
+              "text": "Discard",
+            },
+            Object {
+              "buttonStyles": Object {
+                "root": Object {
+                  "paddingLeft": 20,
+                },
+              },
+              "disabled": false,
+              "iconProps": Object {
+                "iconName": "Refresh",
+              },
+              "key": "refresh",
+              "onClick": [Function],
+              "text": "Refresh",
+            },
+          ]
+        }
+        styles={
+          Object {
+            "root": Object {
+              "paddingLeft": 0,
+            },
+          }
+        }
+      />
+      <Separator
+        styles={
+          Object {
+            "root": Object {
+              "height": 1,
+              "padding": 0,
+              "selectors": Object {
+                "::before": Object {
+                  "background": undefined,
+                },
+              },
+            },
+          }
+        }
+      />
+    </StackItem>
+    <StyledMessageBarBase
+      messageBarType={0}
+    >
+      <Text>
+        refresh performed successfully
+      </Text>
+    </StyledMessageBarBase>
+    <SmartUiComponent
+      currentValues={
+        Map {
+          "throughput" => Object {
+            "disabled": false,
+            "hidden": false,
+            "value": 450,
+          },
+          "analyticalStore" => Object {
+            "disabled": false,
+            "hidden": false,
+            "value": false,
+          },
+          "database" => Object {
+            "disabled": false,
+            "hidden": false,
+            "value": "db2",
+          },
+        }
+      }
+      descriptor={
+        Object {
+          "initialize": [MockFunction] {
+            "calls": Array [
+              Array [],
+              Array [],
+              Array [],
+            ],
+            "results": Array [
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+            ],
+          },
+          "inputNames": Array [
+            "throughput",
+            "analyticalStore",
+            "database",
+          ],
+          "onRefresh": [MockFunction] {
+            "calls": Array [
+              Array [],
+              Array [],
+              Array [],
+              Array [],
+            ],
+            "results": Array [
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+            ],
+          },
+          "onSave": [MockFunction] {
+            "calls": Array [
+              Array [
+                Map {
+                  "throughput" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": 450,
+                  },
+                  "analyticalStore" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": false,
+                  },
+                  "database" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": "db2",
+                  },
+                },
+                Map {
+                  "throughput" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": 450,
+                  },
+                  "analyticalStore" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": false,
+                  },
+                  "database" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": "db2",
+                  },
+                },
+              ],
+              Array [
+                Map {
+                  "throughput" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": 450,
+                  },
+                  "analyticalStore" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": false,
+                  },
+                  "database" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": "db2",
+                  },
+                },
+                Map {
+                  "throughput" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": 450,
+                  },
+                  "analyticalStore" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": false,
+                  },
+                  "database" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": "db2",
+                  },
+                },
+              ],
+            ],
+            "results": Array [
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+            ],
+          },
+          "root": Object {
+            "children": Array [
+              Object {
+                "id": "throughput",
+                "info": undefined,
+                "input": Object {
+                  "dataFieldName": "throughput",
+                  "defaultValue": 400,
+                  "labelTKey": "Throughput (input)",
+                  "max": 500,
+                  "min": 400,
+                  "placeholderTKey": undefined,
+                  "step": 10,
+                  "type": "number",
+                  "uiType": "Spinner",
+                },
+              },
+              Object {
+                "id": "containerId",
+                "info": undefined,
+                "input": Object {
+                  "dataFieldName": "containerId",
+                  "labelTKey": "Container id",
+                  "placeholderTKey": undefined,
+                  "type": "string",
+                },
+              },
+              Object {
+                "id": "analyticalStore",
+                "info": undefined,
+                "input": Object {
+                  "dataFieldName": "analyticalStore",
+                  "defaultValue": true,
+                  "falseLabelTKey": "Disabled",
+                  "labelTKey": "Analytical Store",
+                  "placeholderTKey": undefined,
+                  "trueLabelTKey": "Enabled",
+                  "type": "boolean",
+                },
+              },
+              Object {
+                "id": "database",
+                "info": undefined,
+                "input": Object {
+                  "choices": Array [
+                    Object {
+                      "key": "db1",
+                      "labelTKey": "Database 1",
+                    },
+                    Object {
+                      "key": "db2",
+                      "labelTKey": "Database 2",
+                    },
+                    Object {
+                      "key": "db3",
+                      "labelTKey": "Database 3",
+                    },
+                  ],
+                  "dataFieldName": "database",
+                  "defaultKey": "db2",
+                  "labelTKey": "Database",
+                  "placeholderTKey": undefined,
+                  "type": "object",
+                },
+              },
+            ],
+            "id": "root",
+            "info": Object {
+              "link": Object {
+                "href": "https://aka.ms/azure-cosmos-db-pricing",
+                "textTKey": "More Details",
+              },
+              "messageTKey": "Start at $24/mo per database",
+            },
+          },
+        }
+      }
+      disabled={true}
+      getTranslation={[Function]}
+      onError={[Function]}
+      onInputChange={[Function]}
+    />
+  </Stack>
+</div>
 `;
 
 exports[`SelfServeComponent message bar and spinner snapshots 2`] = `
-<Translation>
-  <Component />
-</Translation>
+<div
+  style={
+    Object {
+      "overflowX": "auto",
+    }
+  }
+>
+  <Stack
+    tokens={
+      Object {
+        "childrenGap": 5,
+        "padding": 10,
+      }
+    }
+  >
+    <StackItem>
+      <StyledCommandBarBase
+        items={
+          Array [
+            Object {
+              "disabled": true,
+              "iconProps": Object {
+                "iconName": "Save",
+              },
+              "key": "save",
+              "onClick": [Function],
+              "text": "Save",
+            },
+            Object {
+              "buttonStyles": Object {
+                "root": Object {
+                  "paddingLeft": 20,
+                },
+              },
+              "disabled": true,
+              "iconProps": Object {
+                "iconName": "Undo",
+              },
+              "key": "discard",
+              "onClick": [Function],
+              "text": "Discard",
+            },
+            Object {
+              "buttonStyles": Object {
+                "root": Object {
+                  "paddingLeft": 20,
+                },
+              },
+              "disabled": false,
+              "iconProps": Object {
+                "iconName": "Refresh",
+              },
+              "key": "refresh",
+              "onClick": [Function],
+              "text": "Refresh",
+            },
+          ]
+        }
+        styles={
+          Object {
+            "root": Object {
+              "paddingLeft": 0,
+            },
+          }
+        }
+      />
+      <Separator
+        styles={
+          Object {
+            "root": Object {
+              "height": 1,
+              "padding": 0,
+              "selectors": Object {
+                "::before": Object {
+                  "background": undefined,
+                },
+              },
+            },
+          }
+        }
+      />
+    </StackItem>
+    <SmartUiComponent
+      currentValues={
+        Map {
+          "throughput" => Object {
+            "disabled": false,
+            "hidden": false,
+            "value": 450,
+          },
+          "analyticalStore" => Object {
+            "disabled": false,
+            "hidden": false,
+            "value": false,
+          },
+          "database" => Object {
+            "disabled": false,
+            "hidden": false,
+            "value": "db2",
+          },
+        }
+      }
+      descriptor={
+        Object {
+          "initialize": [MockFunction] {
+            "calls": Array [
+              Array [],
+              Array [],
+              Array [],
+              Array [],
+            ],
+            "results": Array [
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+            ],
+          },
+          "inputNames": Array [
+            "throughput",
+            "analyticalStore",
+            "database",
+          ],
+          "onRefresh": [MockFunction] {
+            "calls": Array [
+              Array [],
+              Array [],
+              Array [],
+              Array [],
+              Array [],
+              Array [],
+              Array [],
+              Array [],
+            ],
+            "results": Array [
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+            ],
+          },
+          "onSave": [MockFunction] {
+            "calls": Array [
+              Array [
+                Map {
+                  "throughput" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": 450,
+                  },
+                  "analyticalStore" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": false,
+                  },
+                  "database" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": "db2",
+                  },
+                },
+                Map {
+                  "throughput" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": 450,
+                  },
+                  "analyticalStore" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": false,
+                  },
+                  "database" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": "db2",
+                  },
+                },
+              ],
+              Array [
+                Map {
+                  "throughput" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": 450,
+                  },
+                  "analyticalStore" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": false,
+                  },
+                  "database" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": "db2",
+                  },
+                },
+                Map {
+                  "throughput" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": 450,
+                  },
+                  "analyticalStore" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": false,
+                  },
+                  "database" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": "db2",
+                  },
+                },
+              ],
+              Array [
+                Map {
+                  "throughput" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": 450,
+                  },
+                  "analyticalStore" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": false,
+                  },
+                  "database" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": "db2",
+                  },
+                },
+                Map {
+                  "throughput" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": 450,
+                  },
+                  "analyticalStore" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": false,
+                  },
+                  "database" => Object {
+                    "disabled": false,
+                    "hidden": false,
+                    "value": "db2",
+                  },
+                },
+              ],
+            ],
+            "results": Array [
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+            ],
+          },
+          "root": Object {
+            "children": Array [
+              Object {
+                "id": "throughput",
+                "info": undefined,
+                "input": Object {
+                  "dataFieldName": "throughput",
+                  "defaultValue": 400,
+                  "labelTKey": "Throughput (input)",
+                  "max": 500,
+                  "min": 400,
+                  "placeholderTKey": undefined,
+                  "step": 10,
+                  "type": "number",
+                  "uiType": "Spinner",
+                },
+              },
+              Object {
+                "id": "containerId",
+                "info": undefined,
+                "input": Object {
+                  "dataFieldName": "containerId",
+                  "labelTKey": "Container id",
+                  "placeholderTKey": undefined,
+                  "type": "string",
+                },
+              },
+              Object {
+                "id": "analyticalStore",
+                "info": undefined,
+                "input": Object {
+                  "dataFieldName": "analyticalStore",
+                  "defaultValue": true,
+                  "falseLabelTKey": "Disabled",
+                  "labelTKey": "Analytical Store",
+                  "placeholderTKey": undefined,
+                  "trueLabelTKey": "Enabled",
+                  "type": "boolean",
+                },
+              },
+              Object {
+                "id": "database",
+                "info": undefined,
+                "input": Object {
+                  "choices": Array [
+                    Object {
+                      "key": "db1",
+                      "labelTKey": "Database 1",
+                    },
+                    Object {
+                      "key": "db2",
+                      "labelTKey": "Database 2",
+                    },
+                    Object {
+                      "key": "db3",
+                      "labelTKey": "Database 3",
+                    },
+                  ],
+                  "dataFieldName": "database",
+                  "defaultKey": "db2",
+                  "labelTKey": "Database",
+                  "placeholderTKey": undefined,
+                  "type": "object",
+                },
+              },
+            ],
+            "id": "root",
+            "info": Object {
+              "link": Object {
+                "href": "https://aka.ms/azure-cosmos-db-pricing",
+                "textTKey": "More Details",
+              },
+              "messageTKey": "Start at $24/mo per database",
+            },
+          },
+        }
+      }
+      disabled={false}
+      getTranslation={[Function]}
+      onError={[Function]}
+      onInputChange={[Function]}
+    />
+  </Stack>
+</div>
 `;
 
 exports[`SelfServeComponent message bar and spinner snapshots 3`] = `
-<Translation>
-  <Component />
-</Translation>
+<div
+  style={
+    Object {
+      "overflowX": "auto",
+    }
+  }
+>
+  <Stack
+    tokens={
+      Object {
+        "childrenGap": 5,
+        "padding": 10,
+      }
+    }
+  >
+    <StackItem>
+      <StyledCommandBarBase
+        items={
+          Array [
+            Object {
+              "disabled": true,
+              "iconProps": Object {
+                "iconName": "Save",
+              },
+              "key": "save",
+              "onClick": [Function],
+              "text": "Save",
+            },
+            Object {
+              "buttonStyles": Object {
+                "root": Object {
+                  "paddingLeft": 20,
+                },
+              },
+              "disabled": true,
+              "iconProps": Object {
+                "iconName": "Undo",
+              },
+              "key": "discard",
+              "onClick": [Function],
+              "text": "Discard",
+            },
+            Object {
+              "buttonStyles": Object {
+                "root": Object {
+                  "paddingLeft": 20,
+                },
+              },
+              "disabled": true,
+              "iconProps": Object {
+                "iconName": "Refresh",
+              },
+              "key": "refresh",
+              "onClick": [Function],
+              "text": "Refresh",
+            },
+          ]
+        }
+        styles={
+          Object {
+            "root": Object {
+              "paddingLeft": 0,
+            },
+          }
+        }
+      />
+      <Separator
+        styles={
+          Object {
+            "root": Object {
+              "height": 1,
+              "padding": 0,
+              "selectors": Object {
+                "::before": Object {
+                  "background": undefined,
+                },
+              },
+            },
+          }
+        }
+      />
+    </StackItem>
+    <StyledSpinnerBase
+      size={3}
+    />
+  </Stack>
+</div>
 `;
 
 exports[`SelfServeComponent message bar and spinner snapshots 4`] = `
 <StyledMessageBarBase
   messageBarType={1}
 >
-  sample error message
+  <Text>
+    sample error message
+  </Text>
 </StyledMessageBarBase>
 `;
 
 exports[`SelfServeComponent should render and honor save, discard, refresh actions 1`] = `
-<Translation>
-  <Component />
-</Translation>
+<div
+  style={
+    Object {
+      "overflowX": "auto",
+    }
+  }
+>
+  <Stack
+    tokens={
+      Object {
+        "childrenGap": 5,
+        "padding": 10,
+      }
+    }
+  >
+    <StackItem>
+      <StyledCommandBarBase
+        items={
+          Array [
+            Object {
+              "disabled": true,
+              "iconProps": Object {
+                "iconName": "Save",
+              },
+              "key": "save",
+              "onClick": [Function],
+              "text": "Save",
+            },
+            Object {
+              "buttonStyles": Object {
+                "root": Object {
+                  "paddingLeft": 20,
+                },
+              },
+              "disabled": true,
+              "iconProps": Object {
+                "iconName": "Undo",
+              },
+              "key": "discard",
+              "onClick": [Function],
+              "text": "Discard",
+            },
+            Object {
+              "buttonStyles": Object {
+                "root": Object {
+                  "paddingLeft": 20,
+                },
+              },
+              "disabled": false,
+              "iconProps": Object {
+                "iconName": "Refresh",
+              },
+              "key": "refresh",
+              "onClick": [Function],
+              "text": "Refresh",
+            },
+          ]
+        }
+        styles={
+          Object {
+            "root": Object {
+              "paddingLeft": 0,
+            },
+          }
+        }
+      />
+      <Separator
+        styles={
+          Object {
+            "root": Object {
+              "height": 1,
+              "padding": 0,
+              "selectors": Object {
+                "::before": Object {
+                  "background": undefined,
+                },
+              },
+            },
+          }
+        }
+      />
+    </StackItem>
+    <SmartUiComponent
+      currentValues={
+        Map {
+          "throughput" => Object {
+            "disabled": false,
+            "hidden": false,
+            "value": 450,
+          },
+          "analyticalStore" => Object {
+            "disabled": false,
+            "hidden": false,
+            "value": false,
+          },
+          "database" => Object {
+            "disabled": false,
+            "hidden": false,
+            "value": "db2",
+          },
+        }
+      }
+      descriptor={
+        Object {
+          "initialize": [MockFunction] {
+            "calls": Array [
+              Array [],
+            ],
+            "results": Array [
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+            ],
+          },
+          "inputNames": Array [
+            "throughput",
+            "analyticalStore",
+            "database",
+          ],
+          "onRefresh": [MockFunction] {
+            "calls": Array [
+              Array [],
+            ],
+            "results": Array [
+              Object {
+                "type": "return",
+                "value": Promise {},
+              },
+            ],
+          },
+          "onSave": [MockFunction],
+          "root": Object {
+            "children": Array [
+              Object {
+                "id": "throughput",
+                "info": undefined,
+                "input": Object {
+                  "dataFieldName": "throughput",
+                  "defaultValue": 400,
+                  "labelTKey": "Throughput (input)",
+                  "max": 500,
+                  "min": 400,
+                  "placeholderTKey": undefined,
+                  "step": 10,
+                  "type": "number",
+                  "uiType": "Spinner",
+                },
+              },
+              Object {
+                "id": "containerId",
+                "info": undefined,
+                "input": Object {
+                  "dataFieldName": "containerId",
+                  "labelTKey": "Container id",
+                  "placeholderTKey": undefined,
+                  "type": "string",
+                },
+              },
+              Object {
+                "id": "analyticalStore",
+                "info": undefined,
+                "input": Object {
+                  "dataFieldName": "analyticalStore",
+                  "defaultValue": true,
+                  "falseLabelTKey": "Disabled",
+                  "labelTKey": "Analytical Store",
+                  "placeholderTKey": undefined,
+                  "trueLabelTKey": "Enabled",
+                  "type": "boolean",
+                },
+              },
+              Object {
+                "id": "database",
+                "info": undefined,
+                "input": Object {
+                  "choices": Array [
+                    Object {
+                      "key": "db1",
+                      "labelTKey": "Database 1",
+                    },
+                    Object {
+                      "key": "db2",
+                      "labelTKey": "Database 2",
+                    },
+                    Object {
+                      "key": "db3",
+                      "labelTKey": "Database 3",
+                    },
+                  ],
+                  "dataFieldName": "database",
+                  "defaultKey": "db2",
+                  "labelTKey": "Database",
+                  "placeholderTKey": undefined,
+                  "type": "object",
+                },
+              },
+            ],
+            "id": "root",
+            "info": Object {
+              "link": Object {
+                "href": "https://aka.ms/azure-cosmos-db-pricing",
+                "textTKey": "More Details",
+              },
+              "messageTKey": "Start at $24/mo per database",
+            },
+          },
+        }
+      }
+      disabled={false}
+      getTranslation={[Function]}
+      onError={[Function]}
+      onInputChange={[Function]}
+    />
+  </Stack>
+</div>
 `;
diff --git a/src/Shared/Telemetry/TelemetryConstants.ts b/src/Shared/Telemetry/TelemetryConstants.ts
index 9f28a87c5..f14cfaf7e 100644
--- a/src/Shared/Telemetry/TelemetryConstants.ts
+++ b/src/Shared/Telemetry/TelemetryConstants.ts
@@ -114,6 +114,7 @@ export enum Action {
   NotebooksGalleryPublicGalleryCount,
   NotebooksGalleryFavoritesCount,
   NotebooksGalleryPublishedCount,
+  SelfServe,
 }
 
 export const ActionModifiers = {
diff --git a/src/Shared/Telemetry/TelemetryProcessor.ts b/src/Shared/Telemetry/TelemetryProcessor.ts
index 1ca45b9e5..e261f3635 100644
--- a/src/Shared/Telemetry/TelemetryProcessor.ts
+++ b/src/Shared/Telemetry/TelemetryProcessor.ts
@@ -1,58 +1,11 @@
-import { Action, ActionModifiers } from "./TelemetryConstants";
-import { sendMessage } from "../../Common/MessageHandler";
-import { MessageTypes } from "../../Contracts/ExplorerContracts";
-import { appInsights } from "../appInsights";
+import { sendMessage } from "../../Common/MessageHandler";
 import { configContext } from "../../ConfigContext";
+import { MessageTypes } from "../../Contracts/ExplorerContracts";
 import { userContext } from "../../UserContext";
+import { appInsights } from "../appInsights";
+import { Action, ActionModifiers } from "./TelemetryConstants";
 
-// TODO: Remove this. It is perfectly find to pass any data to telemtry methods.
-// This was added only to maintain stability while removing dependencies on explorer.databaseAccount and explorer.defaultExperience
-type allowedKeys =
-  | "notebookId"
-  | "collectionId"
-  | "collectionName"
-  | "error"
-  | "isSample"
-  | "downloadCount"
-  | "baseUrl"
-  | "source"
-  | "description"
-  | "dataExplorerArea"
-  | "databaseName"
-  | "downloadCount"
-  | "favoriteCount"
-  | "abuseCategory"
-  | "errorStack"
-  | "tabTitle"
-  | "tabId"
-  | "conflictResourceType"
-  | "conflictOperationType"
-  | "conflictResourceId"
-  | "message"
-  | "files"
-  | "notebooks"
-  | "directories"
-  | "tabName"
-  | "databaseId"
-  | "queryName"
-  | "isPublishPending"
-  | "label"
-  | "scopesSelected"
-  | "title"
-  | "level"
-  | "changedSelectedValueTo"
-  | "area"
-  | "area"
-  | "paneTitle"
-  | "notebookUrl"
-  | "isNotebookEnabled"
-  | "commandButtonClicked"
-  | "count"
-  | "publishedCount"
-  | "underReviewCount"
-  | "removedCount";
-
-type TelemetryData = { [key in allowedKeys]?: unknown };
+type TelemetryData = { [key: string]: unknown };
 
 export function trace(action: Action, actionModifier: string = ActionModifiers.Mark, data: TelemetryData = {}): void {
   sendMessage({
diff --git a/src/Terminal/index.ts b/src/Terminal/index.ts
index 5994d7057..d9cd73898 100644
--- a/src/Terminal/index.ts
+++ b/src/Terminal/index.ts
@@ -1,5 +1,3 @@
-import "babel-polyfill";
-import "promise-polyfill/src/polyfill"; // polyfill Promise on IE
 import "@jupyterlab/terminal/style/index.css";
 import "./index.css";
 import { ServerConnection } from "@jupyterlab/services";
diff --git a/src/Utils/QueryUtils.test.ts b/src/Utils/QueryUtils.test.ts
index d05f57d2e..76e525a06 100644
--- a/src/Utils/QueryUtils.test.ts
+++ b/src/Utils/QueryUtils.test.ts
@@ -2,7 +2,7 @@ import * as DataModels from "../Contracts/DataModels";
 import * as Q from "q";
 import * as sinon from "sinon";
 import * as ViewModels from "../Contracts/ViewModels";
-import { QueryUtils } from "./QueryUtils";
+import * as QueryUtils from "./QueryUtils";
 
 describe("Query Utils", () => {
   function generatePartitionKeyForPath(path: string): DataModels.PartitionKey {
diff --git a/src/Utils/QueryUtils.ts b/src/Utils/QueryUtils.ts
index 2b3aafc90..b652df70f 100644
--- a/src/Utils/QueryUtils.ts
+++ b/src/Utils/QueryUtils.ts
@@ -1,118 +1,114 @@
-import Q from "q";
 import * as DataModels from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";
 
-export class QueryUtils {
-  public static buildDocumentsQuery(
-    filter: string,
-    partitionKeyProperty: string,
-    partitionKey: DataModels.PartitionKey
-  ): string {
-    let query: string = partitionKeyProperty
-      ? `select c.id, c._self, c._rid, c._ts, ${QueryUtils.buildDocumentsQueryPartitionProjections(
-          "c",
-          partitionKey
-        )} as _partitionKeyValue from c`
-      : `select c.id, c._self, c._rid, c._ts from c`;
+export function buildDocumentsQuery(
+  filter: string,
+  partitionKeyProperty: string,
+  partitionKey: DataModels.PartitionKey
+): string {
+  let query = partitionKeyProperty
+    ? `select c.id, c._self, c._rid, c._ts, ${buildDocumentsQueryPartitionProjections(
+        "c",
+        partitionKey
+      )} as _partitionKeyValue from c`
+    : `select c.id, c._self, c._rid, c._ts from c`;
 
-    if (filter) {
-      query += " " + filter;
-    }
-
-    return query;
+  if (filter) {
+    query += " " + filter;
   }
 
-  public static buildDocumentsQueryPartitionProjections(
-    collectionAlias: string,
-    partitionKey: DataModels.PartitionKey
-  ): string {
-    if (!partitionKey) {
-      return "";
-    }
-
-    // e.g., path /order/id will be projected as c["order"]["id"],
-    // to escape any property names that match a keyword
-    let projections = [];
-    for (let index in partitionKey.paths) {
-      // TODO: Handle "/" in partition key definitions
-      const projectedProperties: string[] = partitionKey.paths[index].split("/").slice(1);
-      let projectedProperty: string = "";
-
-      projectedProperties.forEach((property: string) => {
-        const projection = property.trim();
-        if (projection.length > 0 && projection.charAt(0) != "'" && projection.charAt(0) != '"') {
-          projectedProperty = projectedProperty + `["${projection}"]`;
-        } else if (projection.length > 0 && projection.charAt(0) == "'") {
-          // trim single quotes and escape double quotes
-          const projectionSlice = projection.slice(1, projection.length - 1);
-          projectedProperty =
-            projectedProperty + `["${projectionSlice.replace(/\\"/g, '"').replace(/"/g, '\\\\\\"')}"]`;
-        } else {
-          projectedProperty = projectedProperty + `[${projection}]`;
-        }
-      });
-
-      projections.push(`${collectionAlias}${projectedProperty}`);
-    }
-
-    return projections.join(",");
-  }
-
-  public static async queryPagesUntilContentPresent(
-    firstItemIndex: number,
-    queryItems: (itemIndex: number) => Promise<ViewModels.QueryResults>
-  ): Promise<ViewModels.QueryResults> {
-    let roundTrips: number = 0;
-    let netRequestCharge: number = 0;
-    const doRequest = async (itemIndex: number): Promise<ViewModels.QueryResults> => {
-      const results: ViewModels.QueryResults = await queryItems(itemIndex);
-      roundTrips = roundTrips + 1;
-      results.roundTrips = roundTrips;
-      results.requestCharge = Number(results.requestCharge) + netRequestCharge;
-      netRequestCharge = Number(results.requestCharge);
-      const resultsMetadata: ViewModels.QueryResultsMetadata = {
-        hasMoreResults: results.hasMoreResults,
-        itemCount: results.itemCount,
-        firstItemIndex: results.firstItemIndex,
-        lastItemIndex: results.lastItemIndex,
-      };
-      if (resultsMetadata.itemCount === 0 && resultsMetadata.hasMoreResults) {
-        return await doRequest(resultsMetadata.lastItemIndex);
-      }
-      return results;
-    };
-
-    return await doRequest(firstItemIndex);
-  }
-
-  public static async queryAllPages(
-    queryItems: (itemIndex: number) => Promise<ViewModels.QueryResults>
-  ): Promise<ViewModels.QueryResults> {
-    const queryResults: ViewModels.QueryResults = {
-      documents: [],
-      activityId: undefined,
-      hasMoreResults: false,
-      itemCount: 0,
-      firstItemIndex: 0,
-      lastItemIndex: 0,
-      requestCharge: 0,
-      roundTrips: 0,
-    };
-    const doRequest = async (itemIndex: number): Promise<ViewModels.QueryResults> => {
-      const results: ViewModels.QueryResults = await queryItems(itemIndex);
-      const { requestCharge, hasMoreResults, itemCount, lastItemIndex, documents } = results;
-      queryResults.roundTrips = queryResults.roundTrips + 1;
-      queryResults.requestCharge = Number(queryResults.requestCharge) + Number(requestCharge);
-      queryResults.hasMoreResults = hasMoreResults;
-      queryResults.itemCount = queryResults.itemCount + itemCount;
-      queryResults.lastItemIndex = lastItemIndex;
-      queryResults.documents = queryResults.documents.concat(documents);
-      if (queryResults.hasMoreResults) {
-        return doRequest(queryResults.lastItemIndex + 1);
-      }
-      return queryResults;
-    };
-
-    return doRequest(0);
-  }
+  return query;
 }
+
+export function buildDocumentsQueryPartitionProjections(
+  collectionAlias: string,
+  partitionKey?: DataModels.PartitionKey
+): string {
+  if (!partitionKey) {
+    return "";
+  }
+
+  // e.g., path /order/id will be projected as c["order"]["id"],
+  // to escape any property names that match a keyword
+  const projections = [];
+  for (const index in partitionKey.paths) {
+    // TODO: Handle "/" in partition key definitions
+    const projectedProperties: string[] = partitionKey.paths[index].split("/").slice(1);
+    let projectedProperty = "";
+
+    projectedProperties.forEach((property: string) => {
+      const projection = property.trim();
+      if (projection.length > 0 && projection.charAt(0) !== "'" && projection.charAt(0) !== '"') {
+        projectedProperty += `["${projection}"]`;
+      } else if (projection.length > 0 && projection.charAt(0) === "'") {
+        // trim single quotes and escape double quotes
+        const projectionSlice = projection.slice(1, projection.length - 1);
+        projectedProperty += `["${projectionSlice.replace(/\\"/g, '"').replace(/"/g, '\\\\\\"')}"]`;
+      } else {
+        projectedProperty += `[${projection}]`;
+      }
+    });
+
+    projections.push(`${collectionAlias}${projectedProperty}`);
+  }
+
+  return projections.join(",");
+}
+
+export const queryPagesUntilContentPresent = async (
+  firstItemIndex: number,
+  queryItems: (itemIndex: number) => Promise<ViewModels.QueryResults>
+): Promise<ViewModels.QueryResults> => {
+  let roundTrips = 0;
+  let netRequestCharge = 0;
+  const doRequest = async (itemIndex: number): Promise<ViewModels.QueryResults> => {
+    const results = await queryItems(itemIndex);
+    roundTrips = roundTrips + 1;
+    results.roundTrips = roundTrips;
+    results.requestCharge = Number(results.requestCharge) + netRequestCharge;
+    netRequestCharge = Number(results.requestCharge);
+    const resultsMetadata = {
+      hasMoreResults: results.hasMoreResults,
+      itemCount: results.itemCount,
+      firstItemIndex: results.firstItemIndex,
+      lastItemIndex: results.lastItemIndex,
+    };
+    if (resultsMetadata.itemCount === 0 && resultsMetadata.hasMoreResults) {
+      return await doRequest(resultsMetadata.lastItemIndex);
+    }
+    return results;
+  };
+
+  return await doRequest(firstItemIndex);
+};
+
+export const queryAllPages = async (
+  queryItems: (itemIndex: number) => Promise<ViewModels.QueryResults>
+): Promise<ViewModels.QueryResults> => {
+  const queryResults: ViewModels.QueryResults = {
+    documents: [],
+    activityId: undefined,
+    hasMoreResults: false,
+    itemCount: 0,
+    firstItemIndex: 0,
+    lastItemIndex: 0,
+    requestCharge: 0,
+    roundTrips: 0,
+  };
+  const doRequest = async (itemIndex: number): Promise<ViewModels.QueryResults> => {
+    const results = await queryItems(itemIndex);
+    const { requestCharge, hasMoreResults, itemCount, lastItemIndex, documents } = results;
+    queryResults.roundTrips = queryResults.roundTrips + 1;
+    queryResults.requestCharge = Number(queryResults.requestCharge) + Number(requestCharge);
+    queryResults.hasMoreResults = hasMoreResults;
+    queryResults.itemCount = queryResults.itemCount + itemCount;
+    queryResults.lastItemIndex = lastItemIndex;
+    queryResults.documents = queryResults.documents.concat(documents);
+    if (queryResults.hasMoreResults) {
+      return doRequest(queryResults.lastItemIndex + 1);
+    }
+    return queryResults;
+  };
+
+  return doRequest(0);
+};
diff --git a/src/hooks/useKnockoutExplorer.ts b/src/hooks/useKnockoutExplorer.ts
index 495e4c8f3..80dd38a68 100644
--- a/src/hooks/useKnockoutExplorer.ts
+++ b/src/hooks/useKnockoutExplorer.ts
@@ -260,7 +260,7 @@ async function configurePortal(explorerParams: ExplorerParams): Promise<Explorer
           explorer.configure(inputs);
           resolve(explorer);
           if (openAction) {
-            handleOpenAction(openAction, explorer.nonSystemDatabases(), explorer);
+            handleOpenAction(openAction, explorer.databases(), explorer);
           }
         }
       },
diff --git a/src/i18n.ts b/src/i18n.ts
index f91c17138..37d0d7cdf 100644
--- a/src/i18n.ts
+++ b/src/i18n.ts
@@ -1,22 +1,14 @@
 import i18n from "i18next";
 import LanguageDetector from "i18next-browser-languagedetector";
 import { initReactI18next } from "react-i18next";
-import XHR from "i18next-http-backend";
-import EnglishTranslations from "./Localization/en/translations.json";
 
 i18n
-  .use(XHR)
   .use(LanguageDetector)
   .use(initReactI18next)
   .init({
-    resources: {
-      en: EnglishTranslations,
-    },
     fallbackLng: "en",
     detection: { order: ["navigator", "cookie", "localStorage", "sessionStorage", "querystring", "htmlTag"] },
     debug: process.env.NODE_ENV === "development",
-    ns: ["translations"],
-    defaultNS: "translations",
     keySeparator: ".",
     interpolation: {
       formatSeparator: ",",
@@ -29,3 +21,5 @@ i18n
       useSuspense: false,
     },
   });
+
+export default i18n;
diff --git a/src/setupTests.ts b/src/setupTests.ts
index 1d06b89ca..86f378bc0 100644
--- a/src/setupTests.ts
+++ b/src/setupTests.ts
@@ -1,7 +1,8 @@
-import Adapter from "enzyme-adapter-react-16";
 import { configure } from "enzyme";
+import Adapter from "enzyme-adapter-react-16";
 import "jest-canvas-mock";
 import { initializeIcons } from "office-ui-fabric-react";
+import { TextDecoder, TextEncoder } from "util";
 configure({ adapter: new Adapter() });
 initializeIcons();
 
@@ -13,3 +14,5 @@ if (typeof window.URL.createObjectURL === "undefined") {
 (<any>window).$ = (<any>window).jQuery = require("jquery");
 (<any>global).$ = (<any>global).$.jQuery = require("jquery");
 require("jquery-ui-dist/jquery-ui");
+(<any>global).TextEncoder = TextEncoder;
+(<any>global).TextDecoder = TextDecoder;
diff --git a/src/workers/upload/index.ts b/src/workers/upload/index.ts
index 10b02a18c..7cf0ecd20 100644
--- a/src/workers/upload/index.ts
+++ b/src/workers/upload/index.ts
@@ -1,7 +1,6 @@
-import "babel-polyfill";
 import { DocumentClientParams, UploadDetailsRecord, UploadDetails } from "./definitions";
 import { client } from "../../Common/CosmosClient";
-import { configContext, updateConfigContext } from "../../ConfigContext";
+import { updateConfigContext } from "../../ConfigContext";
 import { updateUserContext } from "../../UserContext";
 import { getErrorMessage } from "../../Common/ErrorHandlingUtils";
 
diff --git a/tsconfig.json b/tsconfig.json
index 59e7064d3..0d31cf8f3 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,7 +11,7 @@
     "allowSyntheticDefaultImports": true,
     "downlevelIteration": true,
     "module": "esnext",
-    "target": "es5",
+    "target": "es2017",
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "lib": ["es5", "es6", "dom", "webworker.importscripts"],
diff --git a/utils/deployment-status/package-lock.json b/utils/deployment-status/package-lock.json
index 60a3d059c..cd7f0a461 100644
--- a/utils/deployment-status/package-lock.json
+++ b/utils/deployment-status/package-lock.json
@@ -51,9 +51,9 @@
       "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
     },
     "node-fetch": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
     },
     "supports-color": {
       "version": "7.1.0",
diff --git a/utils/deployment-status/package.json b/utils/deployment-status/package.json
index 5eefa5108..40b922b18 100644
--- a/utils/deployment-status/package.json
+++ b/utils/deployment-status/package.json
@@ -12,6 +12,6 @@
   "dependencies": {
     "chalk": "^4.1.0",
     "moment": "^2.27.0",
-    "node-fetch": "^2.6.0"
+    "node-fetch": "^2.6.1"
   }
 }
diff --git a/webpack.config.js b/webpack.config.js
index e6cd411e8..1c5f8193c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -81,23 +81,6 @@ const typescriptRule = {
   exclude: /node_modules/,
 };
 
-// Third party modules are compiled with babel since using ts-loader that much causes webpack to run out of memory
-const ModulesRule = {
-  test: /\.js$/,
-  use: [
-    {
-      loader: "babel-loader",
-      options: {
-        cacheDirectory: ".cache/babel",
-        presets: [["@babel/preset-env", { targets: { ie: "11" }, useBuiltIns: false }]],
-      },
-    },
-  ],
-  include: /node_modules/,
-  // Exclude large modules we know don't need transpiling
-  exclude: /vega|monaco|plotly/,
-};
-
 module.exports = function (env = {}, argv = {}) {
   const mode = argv.mode || "development";
   const rules = [fontRule, lessRule, imagesRule, cssRule, htmlRule, typescriptRule];
@@ -107,7 +90,6 @@ module.exports = function (env = {}, argv = {}) {
   };
 
   if (mode === "production") {
-    rules.push(ModulesRule);
     envVars.NODE_ENV = "production";
   }
 
@@ -235,7 +217,6 @@ module.exports = function (env = {}, argv = {}) {
       minimize: mode === "production" ? true : false,
       minimizer: [
         new TerserPlugin({
-          cache: ".cache/terser",
           terserOptions: {
             // These options increase our initial bundle size by ~5% but the builds are significantly faster and won't run out of memory
             compress: false,