diff --git a/package-lock.json b/package-lock.json
index d49467d64..23e88b0dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -665,14 +665,6 @@
         "@types/node": "*"
       }
     },
-    "@types/ws": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz",
-      "integrity": "sha512-PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
     "@types/zen-observable": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.0.tgz",
@@ -841,15 +833,6 @@
         }
       }
     },
-    "apollo-cache-control": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.9.1.tgz",
-      "integrity": "sha512-9t2EcRevUrANuGhF5XUbKJEfnc6Jy2Rn7Y8nOIKlsEEC+AX7Ko4svWYTyyTxj0h0RXfiegY2nbz4sVry/pS3rA==",
-      "requires": {
-        "apollo-server-env": "^2.4.3",
-        "graphql-extensions": "^0.11.1"
-      }
-    },
     "apollo-cache-inmemory": {
       "version": "1.6.6",
       "resolved": "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.6.tgz",
@@ -926,30 +909,6 @@
         }
       }
     },
-    "apollo-datasource": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.7.0.tgz",
-      "integrity": "sha512-Yja12BgNQhzuFGG/5Nw2MQe0hkuQy2+9er09HxeEyAf2rUDIPnhPrn1MDoZTB8MU7UGfjwITC+1ofzKkkrZobA==",
-      "requires": {
-        "apollo-server-caching": "^0.5.1",
-        "apollo-server-env": "^2.4.3"
-      }
-    },
-    "apollo-engine-reporting": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.7.1.tgz",
-      "integrity": "sha512-9ykddPxlC95R9CkkJaPaGriRbOGfzeKqqPXRAunyX1h4sG/8g+MJ/gGzmnNf63k6RvRUdRENCE83wPk2OeU+2A==",
-      "requires": {
-        "apollo-engine-reporting-protobuf": "^0.4.4",
-        "apollo-graphql": "^0.4.0",
-        "apollo-server-caching": "^0.5.1",
-        "apollo-server-env": "^2.4.3",
-        "apollo-server-errors": "^2.4.1",
-        "apollo-server-types": "^0.3.1",
-        "async-retry": "^1.2.1",
-        "graphql-extensions": "^0.11.1"
-      }
-    },
     "apollo-engine-reporting-protobuf": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.4.4.tgz",
@@ -976,15 +935,6 @@
         }
       }
     },
-    "apollo-graphql": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.4.1.tgz",
-      "integrity": "sha512-dz2wtGeCqUDAKAj4KXLKLZiFY791aoXduul3KcLo8/6SwqWlsuZiPe0oB8mENHZZc/EchCpTMTJZX2ZENsOt2A==",
-      "requires": {
-        "apollo-env": "^0.6.2",
-        "lodash.sortby": "^4.7.0"
-      }
-    },
     "apollo-link": {
       "version": "1.2.14",
       "resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.14.tgz",
@@ -1037,25 +987,25 @@
       }
     },
     "apollo-server-core": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.12.0.tgz",
-      "integrity": "sha512-BRVdOyZrRJ1ALlmis0vaOLIHHYu5K3UVKAQKIgHkRh/YY0Av4lpeEXr49ELK04LTeh0DG0pQ5YYYhaX1wFcDEw==",
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.16.1.tgz",
+      "integrity": "sha512-nuwn5ZBbmzPwDetb3FgiFFJlNK7ZBFg8kis/raymrjd3eBGdNcOyMTJDl6J9673X9Xqp+dXQmFYDW/G3G8S1YA==",
       "requires": {
         "@apollographql/apollo-tools": "^0.4.3",
-        "@apollographql/graphql-playground-html": "1.6.24",
+        "@apollographql/graphql-playground-html": "1.6.26",
         "@types/graphql-upload": "^8.0.0",
-        "@types/ws": "^6.0.0",
-        "apollo-cache-control": "^0.9.1",
-        "apollo-datasource": "^0.7.0",
-        "apollo-engine-reporting": "^1.7.1",
-        "apollo-server-caching": "^0.5.1",
-        "apollo-server-env": "^2.4.3",
-        "apollo-server-errors": "^2.4.1",
-        "apollo-server-plugin-base": "^0.7.1",
-        "apollo-server-types": "^0.3.1",
-        "apollo-tracing": "^0.9.1",
+        "@types/ws": "^7.0.0",
+        "apollo-cache-control": "^0.11.1",
+        "apollo-datasource": "^0.7.2",
+        "apollo-engine-reporting": "^2.3.0",
+        "apollo-server-caching": "^0.5.2",
+        "apollo-server-env": "^2.4.5",
+        "apollo-server-errors": "^2.4.2",
+        "apollo-server-plugin-base": "^0.9.1",
+        "apollo-server-types": "^0.5.1",
+        "apollo-tracing": "^0.11.1",
         "fast-json-stable-stringify": "^2.0.0",
-        "graphql-extensions": "^0.11.1",
+        "graphql-extensions": "^0.12.4",
         "graphql-tag": "^2.9.2",
         "graphql-tools": "^4.0.0",
         "graphql-upload": "^8.0.2",
@@ -1065,6 +1015,172 @@
         "ws": "^6.0.0"
       },
       "dependencies": {
+        "@apollographql/graphql-playground-html": {
+          "version": "1.6.26",
+          "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.26.tgz",
+          "integrity": "sha512-XAwXOIab51QyhBxnxySdK3nuMEUohhDsHQ5Rbco/V1vjlP75zZ0ZLHD9dTpXTN8uxKxopb2lUvJTq+M4g2Q0HQ==",
+          "requires": {
+            "xss": "^1.0.6"
+          }
+        },
+        "@types/node-fetch": {
+          "version": "2.5.7",
+          "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz",
+          "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==",
+          "requires": {
+            "@types/node": "*",
+            "form-data": "^3.0.0"
+          }
+        },
+        "@types/ws": {
+          "version": "7.2.6",
+          "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.2.6.tgz",
+          "integrity": "sha512-Q07IrQUSNpr+cXU4E4LtkSIBPie5GLZyyMC1QtQYRLWz701+XcoVygGUZgvLqElq1nU4ICldMYPnexlBsg3dqQ==",
+          "requires": {
+            "@types/node": "*"
+          }
+        },
+        "apollo-cache-control": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.1.tgz",
+          "integrity": "sha512-6iHa8TkcKt4rx5SKRzDNjUIpCQX+7/FlZwD7vRh9JDnM4VH8SWhpj8fUR3CiEY8Kuc4ChXnOY8bCcMju5KPnIQ==",
+          "requires": {
+            "apollo-server-env": "^2.4.5",
+            "apollo-server-plugin-base": "^0.9.1"
+          }
+        },
+        "apollo-datasource": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.7.2.tgz",
+          "integrity": "sha512-ibnW+s4BMp4K2AgzLEtvzkjg7dJgCaw9M5b5N0YKNmeRZRnl/I/qBTQae648FsRKgMwTbRQIvBhQ0URUFAqFOw==",
+          "requires": {
+            "apollo-server-caching": "^0.5.2",
+            "apollo-server-env": "^2.4.5"
+          }
+        },
+        "apollo-engine-reporting": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-2.3.0.tgz",
+          "integrity": "sha512-SbcPLFuUZcRqDEZ6mSs8uHM9Ftr8yyt2IEu0JA8c3LNBmYXSLM7MHqFe80SVcosYSTBgtMz8mLJO8orhYoSYZw==",
+          "requires": {
+            "apollo-engine-reporting-protobuf": "^0.5.2",
+            "apollo-graphql": "^0.5.0",
+            "apollo-server-caching": "^0.5.2",
+            "apollo-server-env": "^2.4.5",
+            "apollo-server-errors": "^2.4.2",
+            "apollo-server-plugin-base": "^0.9.1",
+            "apollo-server-types": "^0.5.1",
+            "async-retry": "^1.2.1",
+            "uuid": "^8.0.0"
+          }
+        },
+        "apollo-engine-reporting-protobuf": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.2.tgz",
+          "integrity": "sha512-4wm9FR3B7UvJxcK/69rOiS5CAJPEYKufeRWb257ZLfX7NGFTMqvbc1hu4q8Ch7swB26rTpkzfsftLED9DqH9qg==",
+          "requires": {
+            "@apollo/protobufjs": "^1.0.3"
+          }
+        },
+        "apollo-env": {
+          "version": "0.6.5",
+          "resolved": "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.5.tgz",
+          "integrity": "sha512-jeBUVsGymeTHYWp3me0R2CZRZrFeuSZeICZHCeRflHTfnQtlmbSXdy5E0pOyRM9CU4JfQkKDC98S1YglQj7Bzg==",
+          "requires": {
+            "@types/node-fetch": "2.5.7",
+            "core-js": "^3.0.1",
+            "node-fetch": "^2.2.0",
+            "sha.js": "^2.4.11"
+          }
+        },
+        "apollo-graphql": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.5.0.tgz",
+          "integrity": "sha512-YSdF/BKPbsnQpxWpmCE53pBJX44aaoif31Y22I/qKpB6ZSGzYijV5YBoCL5Q15H2oA/v/02Oazh9lbp4ek3eig==",
+          "requires": {
+            "apollo-env": "^0.6.5",
+            "lodash.sortby": "^4.7.0"
+          }
+        },
+        "apollo-server-caching": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.2.tgz",
+          "integrity": "sha512-HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ==",
+          "requires": {
+            "lru-cache": "^5.0.0"
+          }
+        },
+        "apollo-server-env": {
+          "version": "2.4.5",
+          "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.5.tgz",
+          "integrity": "sha512-nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA==",
+          "requires": {
+            "node-fetch": "^2.1.2",
+            "util.promisify": "^1.0.0"
+          }
+        },
+        "apollo-server-errors": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.4.2.tgz",
+          "integrity": "sha512-FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ=="
+        },
+        "apollo-server-plugin-base": {
+          "version": "0.9.1",
+          "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.9.1.tgz",
+          "integrity": "sha512-kvrX4Z3FdpjrZdHkyl5iY2A1Wvp4b6KQp00DeZqss7GyyKNUBKr80/7RQgBLEw7EWM7WB19j459xM/TjvW0FKQ==",
+          "requires": {
+            "apollo-server-types": "^0.5.1"
+          }
+        },
+        "apollo-server-types": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.5.1.tgz",
+          "integrity": "sha512-my2cPw+DAb2qVnIuBcsRKGyS28uIc2vjFxa1NpRoJZe9gK0BWUBk7wzXnIzWy3HZ5Er11e/40MPTUesNfMYNVA==",
+          "requires": {
+            "apollo-engine-reporting-protobuf": "^0.5.2",
+            "apollo-server-caching": "^0.5.2",
+            "apollo-server-env": "^2.4.5"
+          }
+        },
+        "apollo-tracing": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.11.1.tgz",
+          "integrity": "sha512-l7g+uILw7v32GA46IRXIx5XXbZhFI96BhSqrGK9yyvfq+NMcvVZrj3kIhRImPGhAjMdV+5biA/jztabElAbDjg==",
+          "requires": {
+            "apollo-server-env": "^2.4.5",
+            "apollo-server-plugin-base": "^0.9.1"
+          }
+        },
+        "core-js": {
+          "version": "3.6.5",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+          "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
+        },
+        "form-data": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
+          "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.8",
+            "mime-types": "^2.1.12"
+          }
+        },
+        "graphql-extensions": {
+          "version": "0.12.4",
+          "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.4.tgz",
+          "integrity": "sha512-GnR4LiWk3s2bGOqIh6V1JgnSXw2RCH4NOgbCFEWvB6JqWHXTlXnLZ8bRSkCiD4pltv7RHUPWqN/sGh8R6Ae/ag==",
+          "requires": {
+            "@apollographql/apollo-tools": "^0.4.3",
+            "apollo-server-env": "^2.4.5",
+            "apollo-server-types": "^0.5.1"
+          }
+        },
+        "uuid": {
+          "version": "8.3.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz",
+          "integrity": "sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ=="
+        },
         "ws": {
           "version": "6.2.1",
           "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
@@ -1084,11 +1200,6 @@
         "util.promisify": "^1.0.0"
       }
     },
-    "apollo-server-errors": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.4.1.tgz",
-      "integrity": "sha512-7oEd6pUxqyWYUbQ9TA8tM0NU/3aGtXSEibo6+txUkuHe7QaxfZ2wHRp+pfT1LC1K3RXYjKj61/C2xEO19s3Kdg=="
-    },
     "apollo-server-express": {
       "version": "2.12.0",
       "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.12.0.tgz",
@@ -1112,14 +1223,6 @@
         "type-is": "^1.6.16"
       }
     },
-    "apollo-server-plugin-base": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.7.1.tgz",
-      "integrity": "sha512-PRavvoWq7/Xufqc+qkDQg3Aqueq4QrPBFfoCFIjhkJ4n2d2YoqE3gTGccb8YoWusfa62ASMn6R47OdNuVtEbXw==",
-      "requires": {
-        "apollo-server-types": "^0.3.1"
-      }
-    },
     "apollo-server-testing": {
       "version": "2.12.0",
       "resolved": "https://registry.npmjs.org/apollo-server-testing/-/apollo-server-testing-2.12.0.tgz",
@@ -1138,15 +1241,6 @@
         "apollo-server-env": "^2.4.3"
       }
     },
-    "apollo-tracing": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.9.1.tgz",
-      "integrity": "sha512-4wVNM6rc70XhwWxuDWrMBLaHA8NjB9pUS2sNpddQvP36ZtQfsa08XLSUxGAZT+bej+TzW26hKNtuO31RgqC9Hg==",
-      "requires": {
-        "apollo-server-env": "^2.4.3",
-        "graphql-extensions": "^0.11.1"
-      }
-    },
     "apollo-utilities": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.3.3.tgz",
@@ -2282,6 +2376,11 @@
         "type-fest": "^0.8.1"
       }
     },
+    "cssfilter": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz",
+      "integrity": "sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4="
+    },
     "cz-conventional-changelog": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/cz-conventional-changelog/-/cz-conventional-changelog-3.1.0.tgz",
@@ -3584,16 +3683,6 @@
         "iterall": "^1.2.2"
       }
     },
-    "graphql-extensions": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.11.1.tgz",
-      "integrity": "sha512-1bstq6YKaC579PTw9gchw2VlXqjPo3vn8NjRMaUqF2SxyYTjVSgXaCAbaeNa0B7xlLVigxi3DV1zh4A+ss+Lwg==",
-      "requires": {
-        "@apollographql/apollo-tools": "^0.4.3",
-        "apollo-server-env": "^2.4.3",
-        "apollo-server-types": "^0.3.1"
-      }
-    },
     "graphql-redis-subscriptions": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/graphql-redis-subscriptions/-/graphql-redis-subscriptions-2.2.2.tgz",
@@ -7619,6 +7708,22 @@
       "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
       "dev": true
     },
+    "xss": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/xss/-/xss-1.0.8.tgz",
+      "integrity": "sha512-3MgPdaXV8rfQ/pNn16Eio6VXYPTkqwa0vc7GkiymmY/DqR1SE/7VPAAVZz1GJsJFrllMYO3RHfEaiUGjab6TNw==",
+      "requires": {
+        "commander": "^2.20.3",
+        "cssfilter": "0.0.10"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+        }
+      }
+    },
     "xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",