diff --git a/package-lock.json b/package-lock.json
index fa0e53e..5f7e05c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
         "lint-staged": "^13.0.2",
         "lodash.camelcase": "^4.3.0",
         "prettier": "^2.6.2",
-        "sql-formatter": "^7.0.2",
+        "sql-formatter": "^10.1.0",
         "ts-loader": "~9.3.1",
         "ts-node": "^10.7.0",
         "tsconfig-paths-webpack-plugin": "^3.5.1",
@@ -5888,6 +5888,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/discontinuous-range": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz",
+      "integrity": "sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==",
+      "dev": true
+    },
     "node_modules/doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -8954,6 +8960,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/moo": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.1.tgz",
+      "integrity": "sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==",
+      "dev": true
+    },
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -9000,6 +9012,28 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
+    "node_modules/nearley": {
+      "version": "2.20.1",
+      "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz",
+      "integrity": "sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==",
+      "dev": true,
+      "dependencies": {
+        "commander": "^2.19.0",
+        "moo": "^0.5.0",
+        "railroad-diagrams": "^1.0.0",
+        "randexp": "0.4.6"
+      },
+      "bin": {
+        "nearley-railroad": "bin/nearley-railroad.js",
+        "nearley-test": "bin/nearley-test.js",
+        "nearley-unparse": "bin/nearley-unparse.js",
+        "nearleyc": "bin/nearleyc.js"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://nearley.js.org/#give-to-nearley"
+      }
+    },
     "node_modules/negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@@ -10371,6 +10405,25 @@
         "node": ">=8"
       }
     },
+    "node_modules/railroad-diagrams": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz",
+      "integrity": "sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==",
+      "dev": true
+    },
+    "node_modules/randexp": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz",
+      "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==",
+      "dev": true,
+      "dependencies": {
+        "discontinuous-range": "1.0.0",
+        "ret": "~0.1.10"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -10836,6 +10889,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
     "node_modules/retry": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
@@ -11239,12 +11301,13 @@
       }
     },
     "node_modules/sql-formatter": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/sql-formatter/-/sql-formatter-7.0.2.tgz",
-      "integrity": "sha512-l6JVgMKT3Nzq7Jtpf43QhL26QEM5ICDMN2ARnZz5Z2l1d6e2mT/nRWAZun9kSSkrHrOAsBn20vknWFWuOlz3ww==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/sql-formatter/-/sql-formatter-10.1.0.tgz",
+      "integrity": "sha512-8oJY3Q1rorge0lCFMYZ7vNmQPK/5lAecEBrMcoLFRFWkHL+ZfStau1KO4q8PP+pQekoKJaGidNALhTyLINuOHw==",
       "dev": true,
       "dependencies": {
-        "argparse": "^2.0.1"
+        "argparse": "^2.0.1",
+        "nearley": "^2.20.1"
       },
       "bin": {
         "sql-formatter": "bin/sql-formatter-cli.js"
@@ -12495,211 +12558,212 @@
     },
     "packages/ad-radar": {
       "name": "@hestiaai/ad-radar",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     },
     "packages/amazon": {
       "name": "@hestiaai/amazon",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     },
     "packages/apple": {
       "name": "@hestiaai/apple",
-      "version": "0.0.1-alpha.23",
+      "version": "0.0.1-alpha.25",
       "license": "UNLICENSED"
     },
     "packages/apple-tracker": {
       "name": "@hestiaai/apple-tracker",
-      "version": "0.0.1-alpha.14",
+      "version": "0.0.1-alpha.16",
       "license": "UNLICENSED"
     },
     "packages/apple-tracker-agg": {
       "name": "@hestiaai/apple-tracker-agg",
-      "version": "0.0.1-alpha.11",
+      "version": "0.0.1-alpha.13",
       "license": "UNLICENSED"
     },
     "packages/bookbeat": {
       "name": "@hestiaai/bookbeat",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     },
     "packages/demdex": {
       "name": "@hestiaai/demdex",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     },
     "packages/easyjet": {
       "name": "@hestiaai/easyjet",
-      "version": "0.0.1-alpha.19",
+      "version": "0.0.1-alpha.21",
       "license": "UNLICENSED"
     },
     "packages/explorer": {
       "name": "@hestiaai/explorer",
-      "version": "0.0.1-alpha.23",
+      "version": "0.0.1-alpha.25",
       "license": "UNLICENSED"
     },
     "packages/facebook": {
       "name": "@hestiaai/facebook",
-      "version": "0.0.1-alpha.32",
+      "version": "0.0.1-alpha.34",
       "license": "UNLICENSED"
     },
     "packages/finnair": {
       "name": "@hestiaai/finnair",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     },
     "packages/fitbit": {
       "name": "@hestiaai/fitbit",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     },
     "packages/full-contact": {
       "name": "@hestiaai/full-contact",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     },
     "packages/gigantti": {
       "name": "@hestiaai/gigantti",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     },
     "packages/google": {
       "name": "@hestiaai/google",
-      "version": "0.0.1-alpha.45",
+      "version": "0.0.1-alpha.47",
       "license": "UNLICENSED"
     },
     "packages/google-agg": {
       "name": "@hestiaai/google-agg",
-      "version": "0.0.1-alpha.23",
+      "version": "0.0.1-alpha.25",
       "license": "UNLICENSED"
     },
     "packages/helsingin-sanomat": {
       "name": "@hestiaai/helsingin-sanomat",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     },
     "packages/her": {
       "name": "@hestiaai/her",
-      "version": "0.0.1-alpha.26",
+      "version": "0.0.1-alpha.28",
       "license": "UNLICENSED"
     },
     "packages/her-tinder-agg": {
       "name": "@hestiaai/her-tinder-agg",
-      "version": "0.0.1-alpha.20",
+      "version": "0.0.1-alpha.27",
       "license": "UNLICENSED"
     },
     "packages/hsl": {
       "name": "@hestiaai/hsl",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     },
     "packages/instagram": {
       "name": "@hestiaai/instagram",
-      "version": "0.0.1-alpha.36",
+      "version": "0.0.1-alpha.38",
       "license": "UNLICENSED"
     },
     "packages/k-ryhma": {
       "name": "@hestiaai/k-ryhma",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     },
     "packages/lime": {
       "name": "@hestiaai/lime",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     },
     "packages/linkedin": {
       "name": "@hestiaai/linkedin",
-      "version": "0.0.1-alpha.24",
+      "version": "0.0.1-alpha.26",
       "license": "UNLICENSED"
     },
     "packages/netflix": {
       "name": "@hestiaai/netflix",
-      "version": "0.0.1-alpha.24",
+      "version": "0.0.1-alpha.26",
       "license": "UNLICENSED"
     },
     "packages/other": {
       "name": "@hestiaai/other",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     },
     "packages/s-ryhma": {
       "name": "@hestiaai/s-ryhma",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     },
     "packages/sbb": {
       "name": "@hestiaai/sbb",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     },
     "packages/signal": {
       "name": "@hestiaai/signal",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     },
     "packages/spotify": {
       "name": "@hestiaai/spotify",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     },
     "packages/strava": {
       "name": "@hestiaai/strava",
-      "version": "0.0.1-alpha.21",
+      "version": "0.0.1-alpha.23",
       "license": "UNLICENSED"
     },
     "packages/tiktok": {
       "name": "@hestiaai/tiktok",
-      "version": "0.0.1-alpha.29",
+      "version": "0.0.1-alpha.31",
       "license": "UNLICENSED"
     },
     "packages/tinder": {
       "name": "@hestiaai/tinder",
-      "version": "0.0.1-alpha.31",
+      "version": "0.0.1-alpha.33",
       "license": "UNLICENSED"
     },
     "packages/tracker-control": {
       "name": "@hestiaai/tracker-control",
-      "version": "0.0.1-alpha.30",
+      "version": "0.0.1-alpha.32",
       "license": "UNLICENSED"
     },
     "packages/tracker-control-agg": {
       "name": "@hestiaai/tracker-control-agg",
-      "version": "0.0.1-alpha.15",
+      "version": "0.0.1-alpha.17",
       "license": "UNLICENSED"
     },
     "packages/twitter": {
       "name": "@hestiaai/twitter",
-      "version": "0.0.1-alpha.35",
+      "version": "0.0.1-alpha.38",
       "license": "UNLICENSED"
     },
     "packages/uber": {
       "name": "@hestiaai/uber",
-      "version": "0.0.1-alpha.25",
+      "version": "0.0.1-alpha.27",
       "license": "UNLICENSED"
     },
     "packages/uber-driver": {
-      "version": "0.0.1-alpha.2",
+      "name": "@hestiaai/uber-driver",
+      "version": "0.0.1-alpha.5",
       "license": "UNLICENSED"
     },
     "packages/voi": {
       "name": "@hestiaai/voi",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     },
     "packages/whatsapp": {
       "name": "@hestiaai/whatsapp",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     },
     "packages/wolt": {
       "name": "@hestiaai/wolt",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     },
     "packages/youtube": {
       "name": "@hestiaai/youtube",
-      "version": "0.0.1-alpha.22",
+      "version": "0.0.1-alpha.24",
       "license": "UNLICENSED"
     }
   },
@@ -17157,6 +17221,12 @@
         "path-type": "^4.0.0"
       }
     },
+    "discontinuous-range": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz",
+      "integrity": "sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==",
+      "dev": true
+    },
     "doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -19499,6 +19569,12 @@
       "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==",
       "dev": true
     },
+    "moo": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.1.tgz",
+      "integrity": "sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==",
+      "dev": true
+    },
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -19538,6 +19614,18 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
+    "nearley": {
+      "version": "2.20.1",
+      "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz",
+      "integrity": "sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==",
+      "dev": true,
+      "requires": {
+        "commander": "^2.19.0",
+        "moo": "^0.5.0",
+        "railroad-diagrams": "^1.0.0",
+        "randexp": "0.4.6"
+      }
+    },
     "negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@@ -20573,6 +20661,22 @@
       "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
       "dev": true
     },
+    "railroad-diagrams": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz",
+      "integrity": "sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==",
+      "dev": true
+    },
+    "randexp": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz",
+      "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==",
+      "dev": true,
+      "requires": {
+        "discontinuous-range": "1.0.0",
+        "ret": "~0.1.10"
+      }
+    },
     "randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -20941,6 +21045,12 @@
         "signal-exit": "^3.0.2"
       }
     },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
+    },
     "retry": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
@@ -21234,12 +21344,13 @@
       }
     },
     "sql-formatter": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/sql-formatter/-/sql-formatter-7.0.2.tgz",
-      "integrity": "sha512-l6JVgMKT3Nzq7Jtpf43QhL26QEM5ICDMN2ARnZz5Z2l1d6e2mT/nRWAZun9kSSkrHrOAsBn20vknWFWuOlz3ww==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/sql-formatter/-/sql-formatter-10.1.0.tgz",
+      "integrity": "sha512-8oJY3Q1rorge0lCFMYZ7vNmQPK/5lAecEBrMcoLFRFWkHL+ZfStau1KO4q8PP+pQekoKJaGidNALhTyLINuOHw==",
       "dev": true,
       "requires": {
-        "argparse": "^2.0.1"
+        "argparse": "^2.0.1",
+        "nearley": "^2.20.1"
       }
     },
     "ssri": {
diff --git a/package.json b/package.json
index 8ee608c..8ec13c8 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "lint-staged": "^13.0.2",
     "lodash.camelcase": "^4.3.0",
     "prettier": "^2.6.2",
-    "sql-formatter": "^7.0.2",
+    "sql-formatter": "^10.1.0",
     "ts-loader": "~9.3.1",
     "ts-node": "^10.7.0",
     "tsconfig-paths-webpack-plugin": "^3.5.1",