diff --git a/ee/clickhouse/queries/funnels/test/__snapshots__/test_funnel.ambr b/ee/clickhouse/queries/funnels/test/__snapshots__/test_funnel.ambr
index 7a767e582a868..9fbc3070dbcbb 100644
--- a/ee/clickhouse/queries/funnels/test/__snapshots__/test_funnel.ambr
+++ b/ee/clickhouse/queries/funnels/test/__snapshots__/test_funnel.ambr
@@ -129,9 +129,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   GROUP BY prop
   '''
 # ---
@@ -279,9 +278,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   GROUP BY prop
   '''
 # ---
@@ -425,9 +423,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   GROUP BY prop
   '''
 # ---
@@ -564,9 +561,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   WHERE steps IN [1, 2, 3]
     AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
   ORDER BY aggregation_target
@@ -708,9 +704,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   WHERE steps IN [2, 3]
     AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
   ORDER BY aggregation_target
@@ -852,9 +847,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   WHERE steps IN [1, 2, 3]
     AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
   ORDER BY aggregation_target
@@ -996,9 +990,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   WHERE steps IN [2, 3]
     AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
   ORDER BY aggregation_target
@@ -1137,9 +1130,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   GROUP BY prop
   '''
 # ---
@@ -1287,9 +1279,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   GROUP BY prop
   '''
 # ---
@@ -1433,9 +1424,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   GROUP BY prop
   '''
 # ---
@@ -1549,9 +1539,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   WHERE steps IN [1, 2, 3]
     AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
   ORDER BY aggregation_target
@@ -1670,9 +1659,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   WHERE steps IN [2, 3]
     AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
   ORDER BY aggregation_target
@@ -1791,9 +1779,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   WHERE steps IN [1, 2, 3]
     AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
   ORDER BY aggregation_target
@@ -1912,9 +1899,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   WHERE steps IN [2, 3]
     AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
   ORDER BY aggregation_target
@@ -2053,9 +2039,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   GROUP BY prop
   '''
 # ---
@@ -2203,9 +2188,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   GROUP BY prop
   '''
 # ---
@@ -2349,9 +2333,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   GROUP BY prop
   '''
 # ---
@@ -2645,9 +2628,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   WHERE steps IN [1, 2, 3]
     AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
   ORDER BY aggregation_target
@@ -2946,9 +2928,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   WHERE steps IN [2, 3]
     AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
   ORDER BY aggregation_target
@@ -3247,9 +3228,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   WHERE steps IN [1, 2, 3]
     AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
   ORDER BY aggregation_target
@@ -3548,9 +3528,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   WHERE steps IN [2, 3]
     AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
   ORDER BY aggregation_target
diff --git a/ee/clickhouse/queries/funnels/test/__snapshots__/test_funnel_correlation.ambr b/ee/clickhouse/queries/funnels/test/__snapshots__/test_funnel_correlation.ambr
index 8d84938457b25..aab051a8e1754 100644
--- a/ee/clickhouse/queries/funnels/test/__snapshots__/test_funnel_correlation.ambr
+++ b/ee/clickhouse/queries/funnels/test/__snapshots__/test_funnel_correlation.ambr
@@ -66,9 +66,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -168,9 +167,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -277,9 +275,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -370,9 +367,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -463,9 +459,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -556,9 +551,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -637,9 +631,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -746,9 +739,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -839,9 +831,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -932,9 +923,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -1025,9 +1015,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -1091,9 +1080,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -1179,9 +1167,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -1267,9 +1254,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -1347,9 +1333,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -1424,9 +1409,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -1501,9 +1485,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -1578,9 +1561,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -1663,9 +1645,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -1751,9 +1732,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -1836,9 +1816,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -1922,9 +1901,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -2011,9 +1989,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -2097,9 +2074,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -2183,9 +2159,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -2269,9 +2244,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -2363,9 +2337,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -2460,9 +2433,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -2554,9 +2526,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -2631,9 +2602,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -2721,9 +2691,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -2795,9 +2764,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -2869,9 +2837,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -2943,9 +2910,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -3009,9 +2975,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -3091,9 +3056,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -3181,9 +3145,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -3255,9 +3218,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -3329,9 +3291,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -3403,9 +3364,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -3469,9 +3429,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -3553,9 +3512,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -3645,9 +3603,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -3721,9 +3678,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -3797,9 +3753,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -3873,9 +3828,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -3941,9 +3895,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -4025,9 +3978,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -4117,9 +4069,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -4193,9 +4144,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -4269,9 +4219,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -4345,9 +4294,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -4413,9 +4361,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -4504,9 +4451,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -4603,9 +4549,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -4686,9 +4631,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -4769,9 +4713,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -4852,9 +4795,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -4927,9 +4869,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
diff --git a/ee/clickhouse/queries/funnels/test/__snapshots__/test_funnel_correlations_persons.ambr b/ee/clickhouse/queries/funnels/test/__snapshots__/test_funnel_correlations_persons.ambr
index 7fbcad06a7edc..f06eaa0dae4b9 100644
--- a/ee/clickhouse/queries/funnels/test/__snapshots__/test_funnel_correlations_persons.ambr
+++ b/ee/clickhouse/queries/funnels/test/__snapshots__/test_funnel_correlations_persons.ambr
@@ -102,9 +102,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -319,9 +318,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2, 3]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -480,9 +478,8 @@
                            OR step_1 = 1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -620,9 +617,8 @@
                       AND (1=1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
@@ -760,9 +756,8 @@
                       AND (1=1) ))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [1, 2]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000),
diff --git a/ee/clickhouse/queries/test/__snapshots__/test_groups_join_query.ambr b/ee/clickhouse/queries/test/__snapshots__/test_groups_join_query.ambr
deleted file mode 100644
index 85b77e616249e..0000000000000
--- a/ee/clickhouse/queries/test/__snapshots__/test_groups_join_query.ambr
+++ /dev/null
@@ -1,55 +0,0 @@
-# serializer version: 1
-# name: test_groups_join_query_filtering
-  tuple(
-    '''
-      
-                      LEFT JOIN (
-                          SELECT
-                              group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                          FROM groups
-                          WHERE team_id = %(team_id)s AND group_type_index = %(group_index_0)s
-                          GROUP BY group_key
-                      ) groups_0
-                      ON "$group_0" == groups_0.group_key
-                      
-    ''',
-    dict({
-      'group_index_0': 0,
-      'team_id': 2,
-    }),
-  )
-# ---
-# name: test_groups_join_query_filtering_with_custom_key_names
-  tuple(
-    '''
-      
-                      LEFT JOIN (
-                          SELECT
-                              group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                          FROM groups
-                          WHERE team_id = %(team_id)s AND group_type_index = %(group_index_0)s
-                          GROUP BY group_key
-                      ) groups_0
-                      ON call_me_industry == groups_0.group_key
-                      
-      
-                      LEFT JOIN (
-                          SELECT
-                              group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_2
-                          FROM groups
-                          WHERE team_id = %(team_id)s AND group_type_index = %(group_index_2)s
-                          GROUP BY group_key
-                      ) groups_2
-                      ON call_me_industry == groups_2.group_key
-                      
-    ''',
-    dict({
-      'group_index_0': 0,
-      'group_index_2': 2,
-      'team_id': 2,
-    }),
-  )
-# ---
diff --git a/ee/clickhouse/queries/test/__snapshots__/test_paths.ambr b/ee/clickhouse/queries/test/__snapshots__/test_paths.ambr
index 5a071ad5b8eba..82a7ba5a1e2b8 100644
--- a/ee/clickhouse/queries/test/__snapshots__/test_paths.ambr
+++ b/ee/clickhouse/queries/test/__snapshots__/test_paths.ambr
@@ -91,9 +91,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps = 1
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000)
@@ -273,9 +272,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps = 1
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000)
@@ -450,9 +448,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps = 1
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000)
@@ -627,9 +624,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps = 1
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000)
@@ -804,9 +800,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps = 1
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000)
@@ -981,9 +976,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps = 1
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000)
@@ -1171,9 +1165,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps = 1
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000)
@@ -1356,9 +1349,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps = 1
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000)
@@ -1541,9 +1533,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps = 1
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000)
@@ -1726,9 +1717,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps = 1
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000)
@@ -1911,9 +1901,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [2, 3]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000)
@@ -2093,9 +2082,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [2, 3]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000)
@@ -2275,9 +2263,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps = 2
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000)
@@ -2457,9 +2444,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [2, 3]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000)
@@ -2639,9 +2625,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [2, 3]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000)
@@ -2823,9 +2808,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [2, 3]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000)
@@ -3002,9 +2986,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [2, 3]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000)
@@ -3181,9 +3164,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [2, 3]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000)
@@ -3360,9 +3342,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [2, 3]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000)
@@ -3539,9 +3520,8 @@
                                  OR step_2 = 1) ))))
               WHERE step_0 = 1 ))
         GROUP BY aggregation_target,
-                 steps,
-                 max_steps
-        HAVING steps = max_steps)
+                 steps
+        HAVING steps = max(max_steps))
      WHERE steps IN [2, 3]
      ORDER BY aggregation_target SETTINGS max_ast_elements=1000000,
                                           max_expanded_ast_elements=1000000)
diff --git a/ee/clickhouse/views/test/__snapshots__/test_clickhouse_experiment_secondary_results.ambr b/ee/clickhouse/views/test/__snapshots__/test_clickhouse_experiment_secondary_results.ambr
index 91bb46c4c3337..755f13eca5c74 100644
--- a/ee/clickhouse/views/test/__snapshots__/test_clickhouse_experiment_secondary_results.ambr
+++ b/ee/clickhouse/views/test/__snapshots__/test_clickhouse_experiment_secondary_results.ambr
@@ -179,9 +179,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   GROUP BY prop
   '''
 # ---
diff --git a/ee/clickhouse/views/test/__snapshots__/test_clickhouse_experiments.ambr b/ee/clickhouse/views/test/__snapshots__/test_clickhouse_experiments.ambr
index 41235937a2595..9a9ce8a732bf7 100644
--- a/ee/clickhouse/views/test/__snapshots__/test_clickhouse_experiments.ambr
+++ b/ee/clickhouse/views/test/__snapshots__/test_clickhouse_experiments.ambr
@@ -101,9 +101,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   GROUP BY prop
   '''
 # ---
@@ -209,117 +208,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
-  GROUP BY prop
-  '''
-# ---
-# name: ClickhouseTestFunnelExperimentResults.test_experiment_flow_with_event_results_for_three_test_variants
-  '''
-  /* user_id:0 celery:posthog.tasks.tasks.sync_insight_caching_state */
-  SELECT team_id,
-         date_diff('second', max(timestamp), now()) AS age
-  FROM events
-  WHERE timestamp > date_sub(DAY, 3, now())
-    AND timestamp < now()
-  GROUP BY team_id
-  ORDER BY age;
-  '''
-# ---
-# name: ClickhouseTestFunnelExperimentResults.test_experiment_flow_with_event_results_for_three_test_variants.1
-  '''
-  /* user_id:0 request:_snapshot_ */
-  SELECT array(replaceRegexpAll(JSONExtractRaw(properties, '$feature/a-b-test'), '^"|"$', '')) AS value,
-         count(*) as count
-  FROM events e
-  WHERE team_id = 2
-    AND event IN ['$pageleave', '$pageview']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-06 00:00:00', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: ClickhouseTestFunnelExperimentResults.test_experiment_flow_with_event_results_for_three_test_variants.2
-  '''
-  /* user_id:0 request:_snapshot_ */
-  SELECT countIf(steps = 1) step_1,
-         countIf(steps = 2) step_2,
-         avg(step_1_average_conversion_time_inner) step_1_average_conversion_time,
-         median(step_1_median_conversion_time_inner) step_1_median_conversion_time,
-         prop
-  FROM
-    (SELECT aggregation_target,
-            steps,
-            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
-            median(step_1_conversion_time) step_1_median_conversion_time_inner ,
-            prop
-     FROM
-       (SELECT aggregation_target,
-               steps,
-               max(steps) over (PARTITION BY aggregation_target,
-                                             prop) as max_steps,
-                               step_1_conversion_time ,
-                               prop
-        FROM
-          (SELECT *,
-                  if(latest_0 <= latest_1
-                     AND latest_1 <= latest_0 + INTERVAL 14 DAY, 2, 1) AS steps ,
-                  if(isNotNull(latest_1)
-                     AND latest_1 <= latest_0 + INTERVAL 14 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
-                  prop
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1 ,
-                                                                       if(has([[''], ['test_1'], ['test'], ['control'], ['unknown_3'], ['unknown_2'], ['unknown_1'], ['test_2']], prop), prop, ['Other']) as prop
-              FROM
-                (SELECT *,
-                        if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, ['']) as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = '$pageview', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = '$pageleave', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           array(replaceRegexpAll(JSONExtractRaw(properties, '$feature/a-b-test'), '^"|"$', '')) AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, notEmpty(arrayFilter(x -> notEmpty(x), prop))) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND event IN ['$pageleave', '$pageview']
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-06 00:00:00', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    WHERE team_id = 2
-                      AND event IN ['$pageleave', '$pageview']
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-06 00:00:00', 'UTC')
-                      AND (step_0 = 1
-                           OR step_1 = 1) )))
-           WHERE step_0 = 1 ))
-     GROUP BY aggregation_target,
-              steps,
-              max_steps,
-              prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   GROUP BY prop
   '''
 # ---
@@ -425,9 +315,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   GROUP BY prop
   '''
 # ---
diff --git a/ee/clickhouse/views/test/funnel/__snapshots__/test_clickhouse_funnel.ambr b/ee/clickhouse/views/test/funnel/__snapshots__/test_clickhouse_funnel.ambr
index 412d3256fecef..50b0b7f5b4bda 100644
--- a/ee/clickhouse/views/test/funnel/__snapshots__/test_clickhouse_funnel.ambr
+++ b/ee/clickhouse/views/test/funnel/__snapshots__/test_clickhouse_funnel.ambr
@@ -45,9 +45,8 @@
                         OR step_1 = 1) ))
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
-              steps,
-              max_steps
-     HAVING steps = max_steps)
+              steps
+     HAVING steps = max(max_steps))
   '''
 # ---
 # name: ClickhouseTestFunnelGroups.test_funnel_aggregation_with_groups.1
@@ -94,9 +93,8 @@
                         OR step_1 = 1) ))
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
-              steps,
-              max_steps
-     HAVING steps = max_steps)
+              steps
+     HAVING steps = max(max_steps))
   WHERE steps IN [1, 2]
   ORDER BY aggregation_target
   LIMIT 100
@@ -151,9 +149,8 @@
                         OR step_1 = 1) ))
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
-              steps,
-              max_steps
-     HAVING steps = max_steps)
+              steps
+     HAVING steps = max(max_steps))
   '''
 # ---
 # name: ClickhouseTestFunnelGroups.test_funnel_group_aggregation_with_groups_entity_filtering.1
@@ -201,9 +198,8 @@
                         OR step_1 = 1) ))
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
-              steps,
-              max_steps
-     HAVING steps = max_steps)
+              steps
+     HAVING steps = max(max_steps))
   WHERE steps IN [1, 2]
   ORDER BY aggregation_target
   LIMIT 100
@@ -272,9 +268,8 @@
                         OR step_1 = 1) ))
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
-              steps,
-              max_steps
-     HAVING steps = max_steps)
+              steps
+     HAVING steps = max(max_steps))
   '''
 # ---
 # name: ClickhouseTestFunnelGroups.test_funnel_with_groups_entity_filtering.1
@@ -335,9 +330,8 @@
                         OR step_1 = 1) ))
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
-              steps,
-              max_steps
-     HAVING steps = max_steps)
+              steps
+     HAVING steps = max(max_steps))
   WHERE steps IN [1, 2]
   ORDER BY aggregation_target
   LIMIT 100
@@ -413,9 +407,8 @@
                         OR step_1 = 1) ))
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
-              steps,
-              max_steps
-     HAVING steps = max_steps)
+              steps
+     HAVING steps = max(max_steps))
   '''
 # ---
 # name: ClickhouseTestFunnelGroups.test_funnel_with_groups_global_filtering.1
@@ -483,9 +476,8 @@
                         OR step_1 = 1) ))
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
-              steps,
-              max_steps
-     HAVING steps = max_steps)
+              steps
+     HAVING steps = max(max_steps))
   WHERE steps IN [1, 2]
   ORDER BY aggregation_target
   LIMIT 100
diff --git a/ee/clickhouse/views/test/funnel/__snapshots__/test_clickhouse_funnel_person.ambr b/ee/clickhouse/views/test/funnel/__snapshots__/test_clickhouse_funnel_person.ambr
index 8c5b674526cd8..1c0b56748d57c 100644
--- a/ee/clickhouse/views/test/funnel/__snapshots__/test_clickhouse_funnel_person.ambr
+++ b/ee/clickhouse/views/test/funnel/__snapshots__/test_clickhouse_funnel_person.ambr
@@ -106,9 +106,8 @@
                               OR step_2 = 1) ))))
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
-              steps,
-              max_steps
-     HAVING steps = max_steps)
+              steps
+     HAVING steps = max(max_steps))
   WHERE steps IN [1, 2, 3]
   ORDER BY aggregation_target
   LIMIT 100
diff --git a/ee/clickhouse/views/test/funnel/__snapshots__/test_clickhouse_funnel_unordered.ambr b/ee/clickhouse/views/test/funnel/__snapshots__/test_clickhouse_funnel_unordered.ambr
index 415893bc9676c..45da7dffb6a8f 100644
--- a/ee/clickhouse/views/test/funnel/__snapshots__/test_clickhouse_funnel_unordered.ambr
+++ b/ee/clickhouse/views/test/funnel/__snapshots__/test_clickhouse_funnel_unordered.ambr
@@ -74,9 +74,8 @@
                         OR step_1 = 1) ))
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
-              steps,
-              max_steps
-     HAVING steps = max_steps)
+              steps
+     HAVING steps = max(max_steps))
   '''
 # ---
 # name: ClickhouseTestUnorderedFunnelGroups.test_unordered_funnel_with_groups.1
@@ -153,9 +152,8 @@
                         OR step_1 = 1) ))
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
-              steps,
-              max_steps
-     HAVING steps = max_steps)
+              steps
+     HAVING steps = max(max_steps))
   WHERE steps IN [1, 2]
   ORDER BY aggregation_target
   LIMIT 100
diff --git a/ee/session_recordings/queries/test/__snapshots__/test_session_recording_list_from_session_replay.ambr b/ee/session_recordings/queries/test/__snapshots__/test_session_recording_list_from_session_replay.ambr
deleted file mode 100644
index 4c8583065167c..0000000000000
--- a/ee/session_recordings/queries/test/__snapshots__/test_session_recording_list_from_session_replay.ambr
+++ /dev/null
@@ -1,1699 +0,0 @@
-# serializer version: 1
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_effect_of_poe_settings_on_query_generated_0_test_poe_v1_still_falls_back_to_person_subquery
-  '''
-  -- running in PoE Mode: person_id_no_override_properties_on_events
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = %(team_id)s -- regardless of what other filters are applied
-   -- limit by storage TTL
-  
-    AND s.min_first_timestamp >= %(clamped_to_storage_ttl)s -- we can filter on the pre-aggregated timestamp columns
-   -- because any not-the-lowest min value is _more_ greater than the min value
-   -- and any not-the-highest max value is _less_ lower than the max value
-  
-    AND s.min_first_timestamp >= %(start_time)s
-    AND s.min_first_timestamp <= %(end_time)s
-    AND s.distinct_id in
-      (select distinct_id
-       from
-         (SELECT distinct_id,
-                 argMax(person_id, version) as current_person_id
-          FROM person_distinct_id2 as pdi
-          INNER JOIN
-            (SELECT id
-             FROM person
-             WHERE team_id = %(team_id)s
-               AND id IN
-                 (SELECT id
-                  FROM person
-                  WHERE team_id = %(team_id)s
-                    AND (has(%(vperson_filter_pre__0)s, replaceRegexpAll(JSONExtractRaw(properties, %(kperson_filter_pre__0)s), '^"|"$', ''))) )
-             GROUP BY id
-             HAVING max(is_deleted) = 0
-             AND (has(%(vpersonquery_person_filter_fin__0)s, replaceRegexpAll(JSONExtractRaw(argMax(person.properties, version), %(kpersonquery_person_filter_fin__0)s), '^"|"$', ''))) SETTINGS optimize_aggregation_in_order = 1) person ON person.id = pdi.person_id
-          WHERE team_id = %(team_id)s
-          GROUP BY distinct_id
-          HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT %(limit)s
-  OFFSET %(offset)s
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_effect_of_poe_settings_on_query_generated_1_test_poe_being_unavailable_we_fall_back_to_person_id_overrides
-  '''
-  -- running in PoE Mode: disabled
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = %(team_id)s -- regardless of what other filters are applied
-   -- limit by storage TTL
-  
-    AND s.min_first_timestamp >= %(clamped_to_storage_ttl)s -- we can filter on the pre-aggregated timestamp columns
-   -- because any not-the-lowest min value is _more_ greater than the min value
-   -- and any not-the-highest max value is _less_ lower than the max value
-  
-    AND s.min_first_timestamp >= %(start_time)s
-    AND s.min_first_timestamp <= %(end_time)s
-    AND s.distinct_id in
-      (select distinct_id
-       from
-         (SELECT distinct_id,
-                 argMax(person_id, version) as current_person_id
-          FROM person_distinct_id2 as pdi
-          INNER JOIN
-            (SELECT id
-             FROM person
-             WHERE team_id = %(team_id)s
-               AND id IN
-                 (SELECT id
-                  FROM person
-                  WHERE team_id = %(team_id)s
-                    AND (has(%(vperson_filter_pre__0)s, replaceRegexpAll(JSONExtractRaw(properties, %(kperson_filter_pre__0)s), '^"|"$', ''))) )
-             GROUP BY id
-             HAVING max(is_deleted) = 0
-             AND (has(%(vpersonquery_person_filter_fin__0)s, replaceRegexpAll(JSONExtractRaw(argMax(person.properties, version), %(kpersonquery_person_filter_fin__0)s), '^"|"$', ''))) SETTINGS optimize_aggregation_in_order = 1) person ON person.id = pdi.person_id
-          WHERE team_id = %(team_id)s
-          GROUP BY distinct_id
-          HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT %(limit)s
-  OFFSET %(offset)s
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_effect_of_poe_settings_on_query_generated_2_test_allow_denormalised_props_fix_does_not_stop_all_poe_processing
-  '''
-  -- running in PoE Mode: person_id_override_properties_on_events
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = %(team_id)s -- regardless of what other filters are applied
-   -- limit by storage TTL
-  
-    AND s.min_first_timestamp >= %(clamped_to_storage_ttl)s -- we can filter on the pre-aggregated timestamp columns
-   -- because any not-the-lowest min value is _more_ greater than the min value
-   -- and any not-the-highest max value is _less_ lower than the max value
-  
-    AND s.min_first_timestamp >= %(start_time)s
-    AND s.min_first_timestamp <= %(end_time)s
-    AND s.session_id in
-      (select `$session_id` as session_id
-       from
-         (-- running in PoE Mode: person_id_override_properties_on_events
-   SELECT `$session_id`
-          FROM events e -- sometimes we have to join on persons so we can access e.g. person_props in filters
-   PREWHERE team_id = %(team_id)s -- regardless of what other filters are applied
-   -- limit by storage TTL
-  
-          AND e.timestamp >= %(clamped_to_storage_ttl)s -- make sure we don't get the occasional unexpected future event
-  
-          AND e.timestamp <= now() -- and then any time filter for the events query
-  
-          AND timestamp >= %(event_start_time)s
-          AND timestamp <= %(event_end_time)s
-          WHERE notEmpty(`$session_id`)
-            AND (has(%(vglobal_0)s, "mat_pp_rgInternal"))-- other times we can check distinct id against a sub query which should be faster than joining
-  
-          GROUP BY `$session_id`
-          HAVING 1=1) as session_events_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT %(limit)s
-  OFFSET %(offset)s
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_effect_of_poe_settings_on_query_generated_3_test_poe_v2_available_person_properties_are_used_in_replay_listing
-  '''
-  -- running in PoE Mode: person_id_override_properties_on_events
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = %(team_id)s -- regardless of what other filters are applied
-   -- limit by storage TTL
-  
-    AND s.min_first_timestamp >= %(clamped_to_storage_ttl)s -- we can filter on the pre-aggregated timestamp columns
-   -- because any not-the-lowest min value is _more_ greater than the min value
-   -- and any not-the-highest max value is _less_ lower than the max value
-  
-    AND s.min_first_timestamp >= %(start_time)s
-    AND s.min_first_timestamp <= %(end_time)s
-    AND s.session_id in
-      (select `$session_id` as session_id
-       from
-         (-- running in PoE Mode: person_id_override_properties_on_events
-   SELECT `$session_id`
-          FROM events e -- sometimes we have to join on persons so we can access e.g. person_props in filters
-   PREWHERE team_id = %(team_id)s -- regardless of what other filters are applied
-   -- limit by storage TTL
-  
-          AND e.timestamp >= %(clamped_to_storage_ttl)s -- make sure we don't get the occasional unexpected future event
-  
-          AND e.timestamp <= now() -- and then any time filter for the events query
-  
-          AND timestamp >= %(event_start_time)s
-          AND timestamp <= %(event_end_time)s
-          WHERE notEmpty(`$session_id`)
-            AND (has(%(vglobal_0)s, "mat_pp_rgInternal"))-- other times we can check distinct id against a sub query which should be faster than joining
-  
-          GROUP BY `$session_id`
-          HAVING 1=1) as session_events_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT %(limit)s
-  OFFSET %(offset)s
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_00_poe_v2_and_materialized_columns_allowed_with_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_00_poe_v2_and_materialized_columns_allowed_with_materialization.1
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.session_id in
-      (select `$session_id` as session_id
-       from
-         (SELECT `$session_id`
-          FROM events e PREWHERE team_id = 2
-          AND e.timestamp >= '2020-12-11 13:46:23'
-          AND e.timestamp <= now()
-          AND timestamp >= '2020-12-24 12:00:00'
-          AND timestamp <= '2021-01-02 01:46:23'
-          WHERE notEmpty(`$session_id`)
-            AND (has(['bla'], "mat_pp_email"))
-          GROUP BY `$session_id`
-          HAVING 1=1) as session_events_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_01_poe_v2_and_materialized_columns_allowed_without_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_01_poe_v2_and_materialized_columns_allowed_without_materialization.1
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.session_id in
-      (select `$session_id` as session_id
-       from
-         (SELECT `$session_id`
-          FROM events e PREWHERE team_id = 2
-          AND e.timestamp >= '2020-12-11 13:46:23'
-          AND e.timestamp <= now()
-          AND timestamp >= '2020-12-24 12:00:00'
-          AND timestamp <= '2021-01-02 01:46:23'
-          WHERE notEmpty(`$session_id`)
-            AND (has(['bla'], "mat_pp_email"))
-          GROUP BY `$session_id`
-          HAVING 1=1) as session_events_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_02_poe_v2_and_materialized_columns_off_with_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_02_poe_v2_and_materialized_columns_off_with_materialization.1
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.session_id in
-      (select `$session_id` as session_id
-       from
-         (SELECT `$session_id`
-          FROM events e PREWHERE team_id = 2
-          AND e.timestamp >= '2020-12-11 13:46:23'
-          AND e.timestamp <= now()
-          AND timestamp >= '2020-12-24 12:00:00'
-          AND timestamp <= '2021-01-02 01:46:23'
-          WHERE notEmpty(`$session_id`)
-            AND (has(['bla'], "mat_pp_email"))
-          GROUP BY `$session_id`
-          HAVING 1=1) as session_events_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_03_poe_v2_and_materialized_columns_off_without_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_03_poe_v2_and_materialized_columns_off_without_materialization.1
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.session_id in
-      (select `$session_id` as session_id
-       from
-         (SELECT `$session_id`
-          FROM events e PREWHERE team_id = 2
-          AND e.timestamp >= '2020-12-11 13:46:23'
-          AND e.timestamp <= now()
-          AND timestamp >= '2020-12-24 12:00:00'
-          AND timestamp <= '2021-01-02 01:46:23'
-          WHERE notEmpty(`$session_id`)
-            AND (has(['bla'], "mat_pp_email"))
-          GROUP BY `$session_id`
-          HAVING 1=1) as session_events_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_04_poe_off_and_materialized_columns_allowed_with_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_04_poe_off_and_materialized_columns_allowed_with_materialization.1
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.distinct_id in
-      (select distinct_id
-       from
-         (SELECT distinct_id,
-                 argMax(person_id, version) as current_person_id
-          FROM person_distinct_id2 as pdi
-          INNER JOIN
-            (SELECT id
-             FROM person
-             WHERE team_id = 2
-               AND id IN
-                 (SELECT id
-                  FROM person
-                  WHERE team_id = 2
-                    AND (has(['bla'], "pmat_email")) )
-             GROUP BY id
-             HAVING max(is_deleted) = 0
-             AND (has(['bla'], argMax(person."pmat_email", version))) SETTINGS optimize_aggregation_in_order = 1) person ON person.id = pdi.person_id
-          WHERE team_id = 2
-          GROUP BY distinct_id
-          HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_05_poe_off_and_materialized_columns_allowed_without_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_05_poe_off_and_materialized_columns_allowed_without_materialization.1
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.distinct_id in
-      (select distinct_id
-       from
-         (SELECT distinct_id,
-                 argMax(person_id, version) as current_person_id
-          FROM person_distinct_id2 as pdi
-          INNER JOIN
-            (SELECT id
-             FROM person
-             WHERE team_id = 2
-               AND id IN
-                 (SELECT id
-                  FROM person
-                  WHERE team_id = 2
-                    AND (has(['bla'], "pmat_email")) )
-             GROUP BY id
-             HAVING max(is_deleted) = 0
-             AND (has(['bla'], argMax(person."pmat_email", version))) SETTINGS optimize_aggregation_in_order = 1) person ON person.id = pdi.person_id
-          WHERE team_id = 2
-          GROUP BY distinct_id
-          HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_06_poe_off_and_materialized_columns_not_allowed_with_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_06_poe_off_and_materialized_columns_not_allowed_with_materialization.1
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.distinct_id in
-      (select distinct_id
-       from
-         (SELECT distinct_id,
-                 argMax(person_id, version) as current_person_id
-          FROM person_distinct_id2 as pdi
-          INNER JOIN
-            (SELECT id
-             FROM person
-             WHERE team_id = 2
-               AND id IN
-                 (SELECT id
-                  FROM person
-                  WHERE team_id = 2
-                    AND (has(['bla'], "pmat_email")) )
-             GROUP BY id
-             HAVING max(is_deleted) = 0
-             AND (has(['bla'], argMax(person."pmat_email", version))) SETTINGS optimize_aggregation_in_order = 1) person ON person.id = pdi.person_id
-          WHERE team_id = 2
-          GROUP BY distinct_id
-          HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_07_poe_off_and_materialized_columns_not_allowed_without_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_07_poe_off_and_materialized_columns_not_allowed_without_materialization.1
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.distinct_id in
-      (select distinct_id
-       from
-         (SELECT distinct_id,
-                 argMax(person_id, version) as current_person_id
-          FROM person_distinct_id2 as pdi
-          INNER JOIN
-            (SELECT id
-             FROM person
-             WHERE team_id = 2
-               AND id IN
-                 (SELECT id
-                  FROM person
-                  WHERE team_id = 2
-                    AND (has(['bla'], "pmat_email")) )
-             GROUP BY id
-             HAVING max(is_deleted) = 0
-             AND (has(['bla'], argMax(person."pmat_email", version))) SETTINGS optimize_aggregation_in_order = 1) person ON person.id = pdi.person_id
-          WHERE team_id = 2
-          GROUP BY distinct_id
-          HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_08_poe_v1_and_materialized_columns_allowed_with_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_08_poe_v1_and_materialized_columns_allowed_with_materialization.1
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.distinct_id in
-      (select distinct_id
-       from
-         (SELECT distinct_id,
-                 argMax(person_id, version) as current_person_id
-          FROM person_distinct_id2 as pdi
-          INNER JOIN
-            (SELECT id
-             FROM person
-             WHERE team_id = 2
-               AND id IN
-                 (SELECT id
-                  FROM person
-                  WHERE team_id = 2
-                    AND (has(['bla'], "pmat_email")) )
-             GROUP BY id
-             HAVING max(is_deleted) = 0
-             AND (has(['bla'], argMax(person."pmat_email", version))) SETTINGS optimize_aggregation_in_order = 1) person ON person.id = pdi.person_id
-          WHERE team_id = 2
-          GROUP BY distinct_id
-          HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_09_poe_v1_and_materialized_columns_allowed_without_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_09_poe_v1_and_materialized_columns_allowed_without_materialization.1
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.distinct_id in
-      (select distinct_id
-       from
-         (SELECT distinct_id,
-                 argMax(person_id, version) as current_person_id
-          FROM person_distinct_id2 as pdi
-          INNER JOIN
-            (SELECT id
-             FROM person
-             WHERE team_id = 2
-               AND id IN
-                 (SELECT id
-                  FROM person
-                  WHERE team_id = 2
-                    AND (has(['bla'], "pmat_email")) )
-             GROUP BY id
-             HAVING max(is_deleted) = 0
-             AND (has(['bla'], argMax(person."pmat_email", version))) SETTINGS optimize_aggregation_in_order = 1) person ON person.id = pdi.person_id
-          WHERE team_id = 2
-          GROUP BY distinct_id
-          HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_10_poe_v1_and_not_materialized_columns_not_allowed_with_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_10_poe_v1_and_not_materialized_columns_not_allowed_with_materialization.1
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.distinct_id in
-      (select distinct_id
-       from
-         (SELECT distinct_id,
-                 argMax(person_id, version) as current_person_id
-          FROM person_distinct_id2 as pdi
-          INNER JOIN
-            (SELECT id
-             FROM person
-             WHERE team_id = 2
-               AND id IN
-                 (SELECT id
-                  FROM person
-                  WHERE team_id = 2
-                    AND (has(['bla'], "pmat_email")) )
-             GROUP BY id
-             HAVING max(is_deleted) = 0
-             AND (has(['bla'], argMax(person."pmat_email", version))) SETTINGS optimize_aggregation_in_order = 1) person ON person.id = pdi.person_id
-          WHERE team_id = 2
-          GROUP BY distinct_id
-          HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_11_poe_v1_and_not_materialized_columns_not_allowed_without_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_event_filter_with_person_properties_materialized_11_poe_v1_and_not_materialized_columns_not_allowed_without_materialization.1
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.distinct_id in
-      (select distinct_id
-       from
-         (SELECT distinct_id,
-                 argMax(person_id, version) as current_person_id
-          FROM person_distinct_id2 as pdi
-          INNER JOIN
-            (SELECT id
-             FROM person
-             WHERE team_id = 2
-               AND id IN
-                 (SELECT id
-                  FROM person
-                  WHERE team_id = 2
-                    AND (has(['bla'], "pmat_email")) )
-             GROUP BY id
-             HAVING max(is_deleted) = 0
-             AND (has(['bla'], argMax(person."pmat_email", version))) SETTINGS optimize_aggregation_in_order = 1) person ON person.id = pdi.person_id
-          WHERE team_id = 2
-          GROUP BY distinct_id
-          HAVING argMax(is_deleted, version) = 0) as session_persons_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_person_id_filter_00_poe_v2_and_materialized_columns_allowed_with_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.distinct_id in
-      (select distinct_id
-       from
-         (SELECT distinct_id,
-                 argMax(person_id, version) as current_person_id
-          FROM person_distinct_id2 as pdi
-          WHERE team_id = 2
-            AND distinct_id IN
-              (SELECT distinct_id
-               FROM person_distinct_id2
-               WHERE team_id = 2
-                 AND person_id = '00000000-0000-0000-0000-000000000000') as all_distinct_ids_that_might_match_a_person
-          GROUP BY distinct_id
-          HAVING argMax(is_deleted, version) = 0
-          AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_person_id_filter_01_poe_v2_and_materialized_columns_allowed_without_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.distinct_id in
-      (select distinct_id
-       from
-         (SELECT distinct_id,
-                 argMax(person_id, version) as current_person_id
-          FROM person_distinct_id2 as pdi
-          WHERE team_id = 2
-            AND distinct_id IN
-              (SELECT distinct_id
-               FROM person_distinct_id2
-               WHERE team_id = 2
-                 AND person_id = '00000000-0000-0000-0000-000000000000') as all_distinct_ids_that_might_match_a_person
-          GROUP BY distinct_id
-          HAVING argMax(is_deleted, version) = 0
-          AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_person_id_filter_02_poe_v2_and_materialized_columns_off_with_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.distinct_id in
-      (select distinct_id
-       from
-         (SELECT distinct_id,
-                 argMax(person_id, version) as current_person_id
-          FROM person_distinct_id2 as pdi
-          WHERE team_id = 2
-            AND distinct_id IN
-              (SELECT distinct_id
-               FROM person_distinct_id2
-               WHERE team_id = 2
-                 AND person_id = '00000000-0000-0000-0000-000000000000') as all_distinct_ids_that_might_match_a_person
-          GROUP BY distinct_id
-          HAVING argMax(is_deleted, version) = 0
-          AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_person_id_filter_03_poe_v2_and_materialized_columns_off_without_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.distinct_id in
-      (select distinct_id
-       from
-         (SELECT distinct_id,
-                 argMax(person_id, version) as current_person_id
-          FROM person_distinct_id2 as pdi
-          WHERE team_id = 2
-            AND distinct_id IN
-              (SELECT distinct_id
-               FROM person_distinct_id2
-               WHERE team_id = 2
-                 AND person_id = '00000000-0000-0000-0000-000000000000') as all_distinct_ids_that_might_match_a_person
-          GROUP BY distinct_id
-          HAVING argMax(is_deleted, version) = 0
-          AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_person_id_filter_04_poe_off_and_materialized_columns_allowed_with_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.distinct_id in
-      (select distinct_id
-       from
-         (SELECT distinct_id,
-                 argMax(person_id, version) as current_person_id
-          FROM person_distinct_id2 as pdi
-          WHERE team_id = 2
-            AND distinct_id IN
-              (SELECT distinct_id
-               FROM person_distinct_id2
-               WHERE team_id = 2
-                 AND person_id = '00000000-0000-0000-0000-000000000000') as all_distinct_ids_that_might_match_a_person
-          GROUP BY distinct_id
-          HAVING argMax(is_deleted, version) = 0
-          AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_person_id_filter_05_poe_off_and_materialized_columns_allowed_without_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.distinct_id in
-      (select distinct_id
-       from
-         (SELECT distinct_id,
-                 argMax(person_id, version) as current_person_id
-          FROM person_distinct_id2 as pdi
-          WHERE team_id = 2
-            AND distinct_id IN
-              (SELECT distinct_id
-               FROM person_distinct_id2
-               WHERE team_id = 2
-                 AND person_id = '00000000-0000-0000-0000-000000000000') as all_distinct_ids_that_might_match_a_person
-          GROUP BY distinct_id
-          HAVING argMax(is_deleted, version) = 0
-          AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_person_id_filter_06_poe_off_and_materialized_columns_not_allowed_with_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.distinct_id in
-      (select distinct_id
-       from
-         (SELECT distinct_id,
-                 argMax(person_id, version) as current_person_id
-          FROM person_distinct_id2 as pdi
-          WHERE team_id = 2
-            AND distinct_id IN
-              (SELECT distinct_id
-               FROM person_distinct_id2
-               WHERE team_id = 2
-                 AND person_id = '00000000-0000-0000-0000-000000000000') as all_distinct_ids_that_might_match_a_person
-          GROUP BY distinct_id
-          HAVING argMax(is_deleted, version) = 0
-          AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_person_id_filter_07_poe_off_and_materialized_columns_not_allowed_without_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.distinct_id in
-      (select distinct_id
-       from
-         (SELECT distinct_id,
-                 argMax(person_id, version) as current_person_id
-          FROM person_distinct_id2 as pdi
-          WHERE team_id = 2
-            AND distinct_id IN
-              (SELECT distinct_id
-               FROM person_distinct_id2
-               WHERE team_id = 2
-                 AND person_id = '00000000-0000-0000-0000-000000000000') as all_distinct_ids_that_might_match_a_person
-          GROUP BY distinct_id
-          HAVING argMax(is_deleted, version) = 0
-          AND current_person_id = '00000000-0000-0000-0000-000000000000') as session_persons_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_person_id_filter_08_poe_v1_and_materialized_columns_allowed_with_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.session_id in
-      (select `$session_id` as session_id
-       from
-         (SELECT `$session_id`
-          FROM events e PREWHERE team_id = 2
-          AND e.timestamp >= '2020-12-11 13:46:23'
-          AND e.timestamp <= now()
-          AND timestamp >= '2020-12-24 12:00:00'
-          AND timestamp <= '2021-01-02 01:46:23'
-          WHERE notEmpty(`$session_id`)
-            AND person_id = '00000000-0000-0000-0000-000000000000'
-          GROUP BY `$session_id`
-          HAVING 1=1) as session_events_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_person_id_filter_09_poe_v1_and_materialized_columns_allowed_without_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.session_id in
-      (select `$session_id` as session_id
-       from
-         (SELECT `$session_id`
-          FROM events e PREWHERE team_id = 2
-          AND e.timestamp >= '2020-12-11 13:46:23'
-          AND e.timestamp <= now()
-          AND timestamp >= '2020-12-24 12:00:00'
-          AND timestamp <= '2021-01-02 01:46:23'
-          WHERE notEmpty(`$session_id`)
-            AND person_id = '00000000-0000-0000-0000-000000000000'
-          GROUP BY `$session_id`
-          HAVING 1=1) as session_events_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_person_id_filter_10_poe_v1_and_not_materialized_columns_not_allowed_with_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.session_id in
-      (select `$session_id` as session_id
-       from
-         (SELECT `$session_id`
-          FROM events e PREWHERE team_id = 2
-          AND e.timestamp >= '2020-12-11 13:46:23'
-          AND e.timestamp <= now()
-          AND timestamp >= '2020-12-24 12:00:00'
-          AND timestamp <= '2021-01-02 01:46:23'
-          WHERE notEmpty(`$session_id`)
-            AND person_id = '00000000-0000-0000-0000-000000000000'
-          GROUP BY `$session_id`
-          HAVING 1=1) as session_events_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
-# name: TestClickhouseSessionRecordingsListFromSessionReplay.test_person_id_filter_11_poe_v1_and_not_materialized_columns_not_allowed_without_materialization
-  '''
-  
-  SELECT s.session_id,
-         any(s.team_id),
-         any(s.distinct_id),
-         min(s.min_first_timestamp) as start_time,
-         max(s.max_last_timestamp) as end_time,
-         dateDiff('SECOND', start_time, end_time) as duration,
-         argMinMerge(s.first_url) as first_url,
-         sum(s.click_count),
-         sum(s.keypress_count),
-         sum(s.mouse_activity_count),
-         sum(s.active_milliseconds)/1000 as active_seconds,
-         duration-active_seconds as inactive_seconds,
-         sum(s.console_log_count) as console_log_count,
-         sum(s.console_warn_count) as console_warn_count,
-         sum(s.console_error_count) as console_error_count
-  FROM session_replay_events s
-  WHERE s.team_id = 2
-    AND s.min_first_timestamp >= '2020-12-11 13:46:23'
-    AND s.min_first_timestamp >= '2020-12-25 00:00:00'
-    AND s.min_first_timestamp <= '2021-01-01 13:46:23'
-    AND s.session_id in
-      (select `$session_id` as session_id
-       from
-         (SELECT `$session_id`
-          FROM events e PREWHERE team_id = 2
-          AND e.timestamp >= '2020-12-11 13:46:23'
-          AND e.timestamp <= now()
-          AND timestamp >= '2020-12-24 12:00:00'
-          AND timestamp <= '2021-01-02 01:46:23'
-          WHERE notEmpty(`$session_id`)
-            AND person_id = '00000000-0000-0000-0000-000000000000'
-          GROUP BY `$session_id`
-          HAVING 1=1) as session_events_sub_query)
-  GROUP BY session_id
-  HAVING 1=1
-  ORDER BY start_time DESC
-  LIMIT 51
-  OFFSET 0
-  '''
-# ---
diff --git a/posthog/api/test/__snapshots__/test_cohort.ambr b/posthog/api/test/__snapshots__/test_cohort.ambr
index 1ea71defb60f8..c36ead6c8eca4 100644
--- a/posthog/api/test/__snapshots__/test_cohort.ambr
+++ b/posthog/api/test/__snapshots__/test_cohort.ambr
@@ -81,7 +81,7 @@
                   cohort_id
   FROM cohortpeople
   WHERE (team_id = 2
-         AND cohort_id = '98'
+         AND cohort_id = '378'
          AND version < '2')
   '''
 # ---
@@ -177,7 +177,7 @@
                   cohort_id
   FROM cohortpeople
   WHERE (team_id = 2
-         AND cohort_id = '98'
+         AND cohort_id = '378'
          AND version < '2')
   '''
 # ---
@@ -187,7 +187,7 @@
   DELETE
   FROM cohortpeople
   WHERE (team_id = 2
-         AND cohort_id = '98'
+         AND cohort_id = '378'
          AND version < '2')
   '''
 # ---
diff --git a/posthog/api/test/__snapshots__/test_element.ambr b/posthog/api/test/__snapshots__/test_element.ambr
index add01fdba35fa..34878bd420b62 100644
--- a/posthog/api/test/__snapshots__/test_element.ambr
+++ b/posthog/api/test/__snapshots__/test_element.ambr
@@ -128,25 +128,3 @@
   WHERE "posthog_organizationmembership"."user_id" = 2
   '''
 # ---
-# name: TestElement.test_element_stats_postgres_queries_are_as_expected.3
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:RATE_LIMIT_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestElement.test_element_stats_postgres_queries_are_as_expected.4
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:HEATMAP_SAMPLE_N'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
diff --git a/posthog/api/test/__snapshots__/test_feature_flag.ambr b/posthog/api/test/__snapshots__/test_feature_flag.ambr
index db27b28fd8ee2..46bb514eb2d18 100644
--- a/posthog/api/test/__snapshots__/test_feature_flag.ambr
+++ b/posthog/api/test/__snapshots__/test_feature_flag.ambr
@@ -2055,211 +2055,3 @@
   OFFSET 10000
   '''
 # ---
-# name: TestResiliency.test_feature_flags_v3_with_experience_continuity_working_slow_db
-  '''
-  WITH target_person_ids AS
-    (SELECT team_id,
-            person_id
-     FROM posthog_persondistinctid
-     WHERE team_id = 2
-       AND distinct_id = ANY('{example_id,random}') ),
-       existing_overrides AS
-    (SELECT team_id,
-            person_id,
-            feature_flag_key,
-            hash_key
-     FROM posthog_featureflaghashkeyoverride
-     WHERE team_id = 2
-       AND person_id IN
-         (SELECT person_id
-          FROM target_person_ids) )
-  SELECT key
-  FROM posthog_featureflag
-  WHERE team_id = 2
-    AND ensure_experience_continuity = TRUE
-    AND active = TRUE
-    AND deleted = FALSE
-    AND key NOT IN
-      (SELECT feature_flag_key
-       FROM existing_overrides)
-  '''
-# ---
-# name: TestResiliency.test_feature_flags_v3_with_experience_continuity_working_slow_db.1
-  '''
-  WITH target_person_ids AS
-    (SELECT team_id,
-            person_id
-     FROM posthog_persondistinctid
-     WHERE team_id = 2
-       AND distinct_id = ANY('{example_id,random}') ),
-       existing_overrides AS
-    (SELECT team_id,
-            person_id,
-            feature_flag_key,
-            hash_key
-     FROM posthog_featureflaghashkeyoverride
-     WHERE team_id = 2
-       AND person_id IN
-         (SELECT person_id
-          FROM target_person_ids) ),
-       flags_to_override AS
-    (SELECT key
-     FROM posthog_featureflag
-     WHERE team_id = 2
-       AND ensure_experience_continuity = TRUE
-       AND active = TRUE
-       AND deleted = FALSE
-       AND key NOT IN
-         (SELECT feature_flag_key
-          FROM existing_overrides) )
-  INSERT INTO posthog_featureflaghashkeyoverride (team_id, person_id, feature_flag_key, hash_key)
-  SELECT team_id,
-         person_id,
-         key,
-         'random'
-  FROM flags_to_override,
-       target_person_ids
-  WHERE EXISTS
-      (SELECT 1
-       FROM posthog_person
-       WHERE id = person_id
-         AND team_id = 2) ON CONFLICT DO NOTHING
-  '''
-# ---
-# name: TestResiliency.test_feature_flags_v3_with_experience_continuity_working_slow_db.2
-  '''
-  SELECT "posthog_persondistinctid"."person_id",
-         "posthog_persondistinctid"."distinct_id"
-  FROM "posthog_persondistinctid"
-  WHERE ("posthog_persondistinctid"."distinct_id" IN ('example_id',
-                                                      'random')
-         AND "posthog_persondistinctid"."team_id" = 2)
-  '''
-# ---
-# name: TestResiliency.test_feature_flags_v3_with_experience_continuity_working_slow_db.3
-  '''
-  SELECT "posthog_featureflaghashkeyoverride"."feature_flag_key",
-         "posthog_featureflaghashkeyoverride"."hash_key",
-         "posthog_featureflaghashkeyoverride"."person_id"
-  FROM "posthog_featureflaghashkeyoverride"
-  WHERE ("posthog_featureflaghashkeyoverride"."person_id" IN (1,
-                                                              2,
-                                                              3,
-                                                              4,
-                                                              5 /* ... */)
-         AND "posthog_featureflaghashkeyoverride"."team_id" = 2)
-  '''
-# ---
-# name: TestResiliency.test_feature_flags_v3_with_experience_continuity_working_slow_db.4
-  '''
-  SELECT (("posthog_person"."properties" -> 'email') = '"tim@posthog.com"'::jsonb
-          AND "posthog_person"."properties" ? 'email'
-          AND NOT (("posthog_person"."properties" -> 'email') = 'null'::jsonb)) AS "flag_X_condition_0",
-         (true) AS "flag_X_condition_0"
-  FROM "posthog_person"
-  INNER JOIN "posthog_persondistinctid" ON ("posthog_person"."id" = "posthog_persondistinctid"."person_id")
-  WHERE ("posthog_persondistinctid"."distinct_id" = 'example_id'
-         AND "posthog_persondistinctid"."team_id" = 2
-         AND "posthog_person"."team_id" = 2)
-  '''
-# ---
-# name: TestResiliency.test_feature_flags_v3_with_experience_continuity_working_slow_db.5
-  '''
-  WITH target_person_ids AS
-    (SELECT team_id,
-            person_id
-     FROM posthog_persondistinctid
-     WHERE team_id = 2
-       AND distinct_id = ANY('{example_id,random}') ),
-       existing_overrides AS
-    (SELECT team_id,
-            person_id,
-            feature_flag_key,
-            hash_key
-     FROM posthog_featureflaghashkeyoverride
-     WHERE team_id = 2
-       AND person_id IN
-         (SELECT person_id
-          FROM target_person_ids) )
-  SELECT key
-  FROM posthog_featureflag
-  WHERE team_id = 2
-    AND ensure_experience_continuity = TRUE
-    AND active = TRUE
-    AND deleted = FALSE
-    AND key NOT IN
-      (SELECT feature_flag_key
-       FROM existing_overrides)
-  '''
-# ---
-# name: TestResiliency.test_feature_flags_v3_with_experience_continuity_working_slow_db.6
-  '''
-  SELECT "posthog_persondistinctid"."person_id",
-         "posthog_persondistinctid"."distinct_id"
-  FROM "posthog_persondistinctid"
-  WHERE ("posthog_persondistinctid"."distinct_id" IN ('example_id',
-                                                      'random')
-         AND "posthog_persondistinctid"."team_id" = 2)
-  '''
-# ---
-# name: TestResiliency.test_feature_flags_v3_with_experience_continuity_working_slow_db.7
-  '''
-  SELECT "posthog_persondistinctid"."person_id",
-         "posthog_persondistinctid"."distinct_id"
-  FROM "posthog_persondistinctid"
-  WHERE ("posthog_persondistinctid"."distinct_id" IN ('random')
-         AND "posthog_persondistinctid"."team_id" = 2)
-  '''
-# ---
-# name: TestResiliency.test_feature_flags_v3_with_group_properties_and_slow_db
-  '''
-  SELECT "posthog_grouptypemapping"."id",
-         "posthog_grouptypemapping"."team_id",
-         "posthog_grouptypemapping"."group_type",
-         "posthog_grouptypemapping"."group_type_index",
-         "posthog_grouptypemapping"."name_singular",
-         "posthog_grouptypemapping"."name_plural"
-  FROM "posthog_grouptypemapping"
-  WHERE "posthog_grouptypemapping"."team_id" = 2
-  '''
-# ---
-# name: TestResiliency.test_feature_flags_v3_with_group_properties_and_slow_db.1
-  '''
-  SELECT "posthog_grouptypemapping"."id",
-         "posthog_grouptypemapping"."team_id",
-         "posthog_grouptypemapping"."group_type",
-         "posthog_grouptypemapping"."group_type_index",
-         "posthog_grouptypemapping"."name_singular",
-         "posthog_grouptypemapping"."name_plural"
-  FROM "posthog_grouptypemapping"
-  WHERE "posthog_grouptypemapping"."team_id" = 2
-  '''
-# ---
-# name: TestResiliency.test_feature_flags_v3_with_group_properties_and_slow_db.2
-  '''
-  SELECT "posthog_grouptypemapping"."id",
-         "posthog_grouptypemapping"."team_id",
-         "posthog_grouptypemapping"."group_type",
-         "posthog_grouptypemapping"."group_type_index",
-         "posthog_grouptypemapping"."name_singular",
-         "posthog_grouptypemapping"."name_plural"
-  FROM "posthog_grouptypemapping"
-  WHERE "posthog_grouptypemapping"."team_id" = 2
-  '''
-# ---
-# name: TestResiliency.test_feature_flags_v3_with_slow_db_doesnt_try_to_compute_conditions_again
-  '''
-  SELECT (("posthog_person"."properties" -> 'email') = '"tim@posthog.com"'::jsonb
-          AND "posthog_person"."properties" ? 'email'
-          AND NOT (("posthog_person"."properties" -> 'email') = 'null'::jsonb)) AS "flag_X_condition_0",
-         (("posthog_person"."properties" -> 'email') = '"tim@posthog.com"'::jsonb
-          AND "posthog_person"."properties" ? 'email'
-          AND NOT (("posthog_person"."properties" -> 'email') = 'null'::jsonb)) AS "flag_X_condition_0",
-         (true) AS "flag_X_condition_0"
-  FROM "posthog_person"
-  INNER JOIN "posthog_persondistinctid" ON ("posthog_person"."id" = "posthog_persondistinctid"."person_id")
-  WHERE ("posthog_persondistinctid"."distinct_id" = 'example_id'
-         AND "posthog_persondistinctid"."team_id" = 2
-         AND "posthog_person"."team_id" = 2)
-  '''
-# ---
diff --git a/posthog/api/test/__snapshots__/test_insight.ambr b/posthog/api/test/__snapshots__/test_insight.ambr
index b9f4801dcbfe0..768244df660f2 100644
--- a/posthog/api/test/__snapshots__/test_insight.ambr
+++ b/posthog/api/test/__snapshots__/test_insight.ambr
@@ -113,9 +113,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   GROUP BY prop
   '''
 # ---
@@ -189,9 +188,8 @@
                         OR step_1 = 1) ))
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
-              steps,
-              max_steps
-     HAVING steps = max_steps)
+              steps
+     HAVING steps = max(max_steps))
   '''
 # ---
 # name: TestInsight.test_insight_funnels_hogql_local_filters
@@ -266,9 +264,8 @@
                         OR step_1 = 1) ))
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
-              steps,
-              max_steps
-     HAVING steps = max_steps)
+              steps
+     HAVING steps = max(max_steps))
   '''
 # ---
 # name: TestInsight.test_insight_trend_hogql_breakdown
@@ -1655,24 +1652,6 @@
   LIMIT 21
   '''
 # ---
-# name: TestInsight.test_listing_insights_does_not_nplus1.30
-  '''
-  SELECT "posthog_taggeditem"."id",
-         "posthog_taggeditem"."tag_id",
-         "posthog_taggeditem"."dashboard_id",
-         "posthog_taggeditem"."insight_id",
-         "posthog_taggeditem"."event_definition_id",
-         "posthog_taggeditem"."property_definition_id",
-         "posthog_taggeditem"."action_id",
-         "posthog_taggeditem"."feature_flag_id"
-  FROM "posthog_taggeditem"
-  WHERE "posthog_taggeditem"."insight_id" IN (1,
-                                              2,
-                                              3,
-                                              4,
-                                              5 /* ... */)
-  '''
-# ---
 # name: TestInsight.test_listing_insights_does_not_nplus1.4
   '''
   SELECT "posthog_team"."id",
diff --git a/posthog/api/test/__snapshots__/test_insight_funnels.ambr b/posthog/api/test/__snapshots__/test_insight_funnels.ambr
index 6a5bc945c0510..e36dfb0bfd2d1 100644
--- a/posthog/api/test/__snapshots__/test_insight_funnels.ambr
+++ b/posthog/api/test/__snapshots__/test_insight_funnels.ambr
@@ -83,9 +83,8 @@
                               OR step_2 = 1) ))))
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
-              steps,
-              max_steps
-     HAVING steps = max_steps),
+              steps
+     HAVING steps = max(max_steps)),
                                           histogram_params AS
     (SELECT ifNull(floor(min(step_1_average_conversion_time_inner)), 0) AS from_seconds,
             ifNull(ceil(max(step_1_average_conversion_time_inner)), 1) AS to_seconds,
@@ -192,9 +191,8 @@
                    AND (1=1) ))
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
-              steps,
-              max_steps
-     HAVING steps = max_steps),
+              steps
+     HAVING steps = max(max_steps)),
                                           histogram_params AS
     (SELECT ifNull(floor(min(step_1_average_conversion_time_inner)), 0) AS from_seconds,
             ifNull(ceil(max(step_1_average_conversion_time_inner)), 1) AS to_seconds,
@@ -403,9 +401,8 @@
                         OR step_2 = 1) ))
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
-              steps,
-              max_steps
-     HAVING steps = max_steps),
+              steps
+     HAVING steps = max(max_steps)),
                                           histogram_params AS
     (SELECT ifNull(floor(min(step_1_average_conversion_time_inner)), 0) AS from_seconds,
             ifNull(ceil(max(step_1_average_conversion_time_inner)), 1) AS to_seconds,
diff --git a/posthog/api/test/__snapshots__/test_organization_feature_flag.ambr b/posthog/api/test/__snapshots__/test_organization_feature_flag.ambr
index cae9ed3e59c63..184b02b22cca2 100644
--- a/posthog/api/test/__snapshots__/test_organization_feature_flag.ambr
+++ b/posthog/api/test/__snapshots__/test_organization_feature_flag.ambr
@@ -1118,586 +1118,33 @@
          AND "posthog_featureflagdashboards"."feature_flag_id" = 2)
   '''
 # ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.37
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.38
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.39
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.4
-  '''
-  SELECT "posthog_organization"."id",
-         "posthog_organization"."name",
-         "posthog_organization"."slug",
-         "posthog_organization"."logo_media_id",
-         "posthog_organization"."created_at",
-         "posthog_organization"."updated_at",
-         "posthog_organization"."plugins_access_level",
-         "posthog_organization"."for_internal_metrics",
-         "posthog_organization"."is_member_join_email_enabled",
-         "posthog_organization"."enforce_2fa",
-         "posthog_organization"."is_hipaa",
-         "posthog_organization"."customer_id",
-         "posthog_organization"."available_product_features",
-         "posthog_organization"."usage",
-         "posthog_organization"."never_drop_data",
-         "posthog_organization"."customer_trust_scores",
-         "posthog_organization"."setup_section_2_completed",
-         "posthog_organization"."personalization",
-         "posthog_organization"."domain_whitelist"
-  FROM "posthog_organization"
-  WHERE "posthog_organization"."id" = '00000000-0000-0000-0000-000000000000'::uuid
-  LIMIT 21
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.40
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.41
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.42
-  '''
-  SELECT "posthog_team"."id",
-         "posthog_team"."uuid",
-         "posthog_team"."organization_id",
-         "posthog_team"."project_id",
-         "posthog_team"."api_token",
-         "posthog_team"."app_urls",
-         "posthog_team"."name",
-         "posthog_team"."slack_incoming_webhook",
-         "posthog_team"."created_at",
-         "posthog_team"."updated_at",
-         "posthog_team"."anonymize_ips",
-         "posthog_team"."completed_snippet_onboarding",
-         "posthog_team"."has_completed_onboarding_for",
-         "posthog_team"."ingested_event",
-         "posthog_team"."autocapture_opt_out",
-         "posthog_team"."autocapture_exceptions_opt_in",
-         "posthog_team"."autocapture_exceptions_errors_to_ignore",
-         "posthog_team"."session_recording_opt_in",
-         "posthog_team"."session_recording_sample_rate",
-         "posthog_team"."session_recording_minimum_duration_milliseconds",
-         "posthog_team"."session_recording_linked_flag",
-         "posthog_team"."session_recording_network_payload_capture_config",
-         "posthog_team"."session_replay_config",
-         "posthog_team"."capture_console_log_opt_in",
-         "posthog_team"."capture_performance_opt_in",
-         "posthog_team"."surveys_opt_in",
-         "posthog_team"."heatmaps_opt_in",
-         "posthog_team"."session_recording_version",
-         "posthog_team"."signup_token",
-         "posthog_team"."is_demo",
-         "posthog_team"."access_control",
-         "posthog_team"."week_start_day",
-         "posthog_team"."inject_web_apps",
-         "posthog_team"."test_account_filters",
-         "posthog_team"."test_account_filters_default_checked",
-         "posthog_team"."path_cleaning_filters",
-         "posthog_team"."timezone",
-         "posthog_team"."data_attributes",
-         "posthog_team"."person_display_name_properties",
-         "posthog_team"."live_events_columns",
-         "posthog_team"."recording_domains",
-         "posthog_team"."primary_dashboard_id",
-         "posthog_team"."extra_settings",
-         "posthog_team"."modifiers",
-         "posthog_team"."correlation_config",
-         "posthog_team"."session_recording_retention_period_days",
-         "posthog_team"."external_data_workspace_id",
-         "posthog_team"."external_data_workspace_last_synced_at"
-  FROM "posthog_team"
-  WHERE "posthog_team"."id" = 2
-  LIMIT 21
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.43
-  '''
-  SELECT "posthog_dashboarditem"."id",
-         "posthog_dashboarditem"."name",
-         "posthog_dashboarditem"."derived_name",
-         "posthog_dashboarditem"."description",
-         "posthog_dashboarditem"."team_id",
-         "posthog_dashboarditem"."filters",
-         "posthog_dashboarditem"."filters_hash",
-         "posthog_dashboarditem"."query",
-         "posthog_dashboarditem"."order",
-         "posthog_dashboarditem"."deleted",
-         "posthog_dashboarditem"."saved",
-         "posthog_dashboarditem"."created_at",
-         "posthog_dashboarditem"."last_refresh",
-         "posthog_dashboarditem"."refreshing",
-         "posthog_dashboarditem"."created_by_id",
-         "posthog_dashboarditem"."is_sample",
-         "posthog_dashboarditem"."short_id",
-         "posthog_dashboarditem"."favorited",
-         "posthog_dashboarditem"."refresh_attempt",
-         "posthog_dashboarditem"."last_modified_at",
-         "posthog_dashboarditem"."last_modified_by_id",
-         "posthog_dashboarditem"."dashboard_id",
-         "posthog_dashboarditem"."layouts",
-         "posthog_dashboarditem"."color",
-         "posthog_dashboarditem"."dive_dashboard_id",
-         "posthog_dashboarditem"."updated_at",
-         "posthog_dashboarditem"."deprecated_tags",
-         "posthog_dashboarditem"."tags"
-  FROM "posthog_dashboarditem"
-  WHERE "posthog_dashboarditem"."id" = 2
-  LIMIT 21
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.44
-  '''
-  SELECT "posthog_team"."id",
-         "posthog_team"."uuid",
-         "posthog_team"."organization_id",
-         "posthog_team"."project_id",
-         "posthog_team"."api_token",
-         "posthog_team"."app_urls",
-         "posthog_team"."name",
-         "posthog_team"."slack_incoming_webhook",
-         "posthog_team"."created_at",
-         "posthog_team"."updated_at",
-         "posthog_team"."anonymize_ips",
-         "posthog_team"."completed_snippet_onboarding",
-         "posthog_team"."has_completed_onboarding_for",
-         "posthog_team"."ingested_event",
-         "posthog_team"."autocapture_opt_out",
-         "posthog_team"."autocapture_exceptions_opt_in",
-         "posthog_team"."autocapture_exceptions_errors_to_ignore",
-         "posthog_team"."session_recording_opt_in",
-         "posthog_team"."session_recording_sample_rate",
-         "posthog_team"."session_recording_minimum_duration_milliseconds",
-         "posthog_team"."session_recording_linked_flag",
-         "posthog_team"."session_recording_network_payload_capture_config",
-         "posthog_team"."session_replay_config",
-         "posthog_team"."capture_console_log_opt_in",
-         "posthog_team"."capture_performance_opt_in",
-         "posthog_team"."surveys_opt_in",
-         "posthog_team"."heatmaps_opt_in",
-         "posthog_team"."session_recording_version",
-         "posthog_team"."signup_token",
-         "posthog_team"."is_demo",
-         "posthog_team"."access_control",
-         "posthog_team"."week_start_day",
-         "posthog_team"."inject_web_apps",
-         "posthog_team"."test_account_filters",
-         "posthog_team"."test_account_filters_default_checked",
-         "posthog_team"."path_cleaning_filters",
-         "posthog_team"."timezone",
-         "posthog_team"."data_attributes",
-         "posthog_team"."person_display_name_properties",
-         "posthog_team"."live_events_columns",
-         "posthog_team"."recording_domains",
-         "posthog_team"."primary_dashboard_id",
-         "posthog_team"."extra_settings",
-         "posthog_team"."modifiers",
-         "posthog_team"."correlation_config",
-         "posthog_team"."session_recording_retention_period_days",
-         "posthog_team"."plugins_opt_in",
-         "posthog_team"."opt_out_capture",
-         "posthog_team"."event_names",
-         "posthog_team"."event_names_with_usage",
-         "posthog_team"."event_properties",
-         "posthog_team"."event_properties_with_usage",
-         "posthog_team"."event_properties_numerical",
-         "posthog_team"."external_data_workspace_id",
-         "posthog_team"."external_data_workspace_last_synced_at"
-  FROM "posthog_team"
-  WHERE "posthog_team"."id" = 2
-  LIMIT 21
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.45
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.46
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.47
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.48
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.49
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.5
-  '''
-  SELECT "posthog_team"."id",
-         "posthog_team"."uuid",
-         "posthog_team"."organization_id",
-         "posthog_team"."project_id",
-         "posthog_team"."api_token",
-         "posthog_team"."app_urls",
-         "posthog_team"."name",
-         "posthog_team"."slack_incoming_webhook",
-         "posthog_team"."created_at",
-         "posthog_team"."updated_at",
-         "posthog_team"."anonymize_ips",
-         "posthog_team"."completed_snippet_onboarding",
-         "posthog_team"."has_completed_onboarding_for",
-         "posthog_team"."ingested_event",
-         "posthog_team"."autocapture_opt_out",
-         "posthog_team"."autocapture_web_vitals_opt_in",
-         "posthog_team"."autocapture_web_vitals_allowed_metrics",
-         "posthog_team"."autocapture_exceptions_opt_in",
-         "posthog_team"."autocapture_exceptions_errors_to_ignore",
-         "posthog_team"."session_recording_opt_in",
-         "posthog_team"."session_recording_sample_rate",
-         "posthog_team"."session_recording_minimum_duration_milliseconds",
-         "posthog_team"."session_recording_linked_flag",
-         "posthog_team"."session_recording_network_payload_capture_config",
-         "posthog_team"."session_replay_config",
-         "posthog_team"."survey_config",
-         "posthog_team"."capture_console_log_opt_in",
-         "posthog_team"."capture_performance_opt_in",
-         "posthog_team"."surveys_opt_in",
-         "posthog_team"."heatmaps_opt_in",
-         "posthog_team"."session_recording_version",
-         "posthog_team"."signup_token",
-         "posthog_team"."is_demo",
-         "posthog_team"."access_control",
-         "posthog_team"."week_start_day",
-         "posthog_team"."inject_web_apps",
-         "posthog_team"."test_account_filters",
-         "posthog_team"."test_account_filters_default_checked",
-         "posthog_team"."path_cleaning_filters",
-         "posthog_team"."timezone",
-         "posthog_team"."data_attributes",
-         "posthog_team"."person_display_name_properties",
-         "posthog_team"."live_events_columns",
-         "posthog_team"."recording_domains",
-         "posthog_team"."primary_dashboard_id",
-         "posthog_team"."extra_settings",
-         "posthog_team"."modifiers",
-         "posthog_team"."correlation_config",
-         "posthog_team"."session_recording_retention_period_days",
-         "posthog_team"."external_data_workspace_id",
-         "posthog_team"."external_data_workspace_last_synced_at"
-  FROM "posthog_team"
-  WHERE "posthog_team"."id" = 2
-  LIMIT 21
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.50
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.51
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.52
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.53
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.54
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.55
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.56
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.57
-  '''
-  SELECT "posthog_team"."id",
-         "posthog_team"."uuid",
-         "posthog_team"."organization_id",
-         "posthog_team"."project_id",
-         "posthog_team"."api_token",
-         "posthog_team"."app_urls",
-         "posthog_team"."name",
-         "posthog_team"."slack_incoming_webhook",
-         "posthog_team"."created_at",
-         "posthog_team"."updated_at",
-         "posthog_team"."anonymize_ips",
-         "posthog_team"."completed_snippet_onboarding",
-         "posthog_team"."has_completed_onboarding_for",
-         "posthog_team"."ingested_event",
-         "posthog_team"."autocapture_opt_out",
-         "posthog_team"."autocapture_exceptions_opt_in",
-         "posthog_team"."autocapture_exceptions_errors_to_ignore",
-         "posthog_team"."session_recording_opt_in",
-         "posthog_team"."session_recording_sample_rate",
-         "posthog_team"."session_recording_minimum_duration_milliseconds",
-         "posthog_team"."session_recording_linked_flag",
-         "posthog_team"."session_recording_network_payload_capture_config",
-         "posthog_team"."session_replay_config",
-         "posthog_team"."capture_console_log_opt_in",
-         "posthog_team"."capture_performance_opt_in",
-         "posthog_team"."surveys_opt_in",
-         "posthog_team"."heatmaps_opt_in",
-         "posthog_team"."session_recording_version",
-         "posthog_team"."signup_token",
-         "posthog_team"."is_demo",
-         "posthog_team"."access_control",
-         "posthog_team"."week_start_day",
-         "posthog_team"."inject_web_apps",
-         "posthog_team"."test_account_filters",
-         "posthog_team"."test_account_filters_default_checked",
-         "posthog_team"."path_cleaning_filters",
-         "posthog_team"."timezone",
-         "posthog_team"."data_attributes",
-         "posthog_team"."person_display_name_properties",
-         "posthog_team"."live_events_columns",
-         "posthog_team"."recording_domains",
-         "posthog_team"."primary_dashboard_id",
-         "posthog_team"."extra_settings",
-         "posthog_team"."modifiers",
-         "posthog_team"."correlation_config",
-         "posthog_team"."session_recording_retention_period_days",
-         "posthog_team"."external_data_workspace_id",
-         "posthog_team"."external_data_workspace_last_synced_at"
-  FROM "posthog_team"
-  WHERE "posthog_team"."id" = 2
-  LIMIT 21
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.58
-  '''
-  SELECT "posthog_dashboardtile"."id",
-         "posthog_dashboardtile"."dashboard_id",
-         "posthog_dashboardtile"."insight_id",
-         "posthog_dashboardtile"."text_id",
-         "posthog_dashboardtile"."layouts",
-         "posthog_dashboardtile"."color",
-         "posthog_dashboardtile"."filters_hash",
-         "posthog_dashboardtile"."last_refresh",
-         "posthog_dashboardtile"."refreshing",
-         "posthog_dashboardtile"."refresh_attempt",
-         "posthog_dashboardtile"."deleted"
-  FROM "posthog_dashboardtile"
-  WHERE "posthog_dashboardtile"."id" = 2
-  LIMIT 21
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.59
-  '''
-  SELECT "posthog_dashboarditem"."id",
-         "posthog_dashboarditem"."name",
-         "posthog_dashboarditem"."derived_name",
-         "posthog_dashboarditem"."description",
-         "posthog_dashboarditem"."team_id",
-         "posthog_dashboarditem"."filters",
-         "posthog_dashboarditem"."filters_hash",
-         "posthog_dashboarditem"."query",
-         "posthog_dashboarditem"."order",
-         "posthog_dashboarditem"."deleted",
-         "posthog_dashboarditem"."saved",
-         "posthog_dashboarditem"."created_at",
-         "posthog_dashboarditem"."last_refresh",
-         "posthog_dashboarditem"."refreshing",
-         "posthog_dashboarditem"."created_by_id",
-         "posthog_dashboarditem"."is_sample",
-         "posthog_dashboarditem"."short_id",
-         "posthog_dashboarditem"."favorited",
-         "posthog_dashboarditem"."refresh_attempt",
-         "posthog_dashboarditem"."last_modified_at",
-         "posthog_dashboarditem"."last_modified_by_id",
-         "posthog_dashboarditem"."dashboard_id",
-         "posthog_dashboarditem"."layouts",
-         "posthog_dashboarditem"."color",
-         "posthog_dashboarditem"."dive_dashboard_id",
-         "posthog_dashboarditem"."updated_at",
-         "posthog_dashboarditem"."deprecated_tags",
-         "posthog_dashboarditem"."tags"
-  FROM "posthog_dashboarditem"
-  WHERE "posthog_dashboarditem"."id" = 2
-  LIMIT 21
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.6
-  '''
-  SELECT "posthog_featureflag"."id",
-         "posthog_featureflag"."key",
-         "posthog_featureflag"."name",
-         "posthog_featureflag"."filters",
-         "posthog_featureflag"."rollout_percentage",
-         "posthog_featureflag"."team_id",
-         "posthog_featureflag"."created_by_id",
-         "posthog_featureflag"."created_at",
-         "posthog_featureflag"."deleted",
-         "posthog_featureflag"."active",
-         "posthog_featureflag"."rollback_conditions",
-         "posthog_featureflag"."performed_rollback",
-         "posthog_featureflag"."ensure_experience_continuity",
-         "posthog_featureflag"."usage_dashboard_id",
-         "posthog_featureflag"."has_enriched_analytics"
-  FROM "posthog_featureflag"
-  WHERE (NOT "posthog_featureflag"."deleted"
-         AND "posthog_featureflag"."key" = 'copied-flag-key'
-         AND "posthog_featureflag"."team_id" = 2)
-  ORDER BY "posthog_featureflag"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.60
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.4
   '''
-  SELECT "posthog_dashboard"."id",
-         "posthog_dashboard"."name",
-         "posthog_dashboard"."description",
-         "posthog_dashboard"."team_id",
-         "posthog_dashboard"."pinned",
-         "posthog_dashboard"."created_at",
-         "posthog_dashboard"."created_by_id",
-         "posthog_dashboard"."deleted",
-         "posthog_dashboard"."last_accessed_at",
-         "posthog_dashboard"."filters",
-         "posthog_dashboard"."creation_mode",
-         "posthog_dashboard"."restriction_level",
-         "posthog_dashboard"."deprecated_tags",
-         "posthog_dashboard"."tags",
-         "posthog_dashboard"."share_token",
-         "posthog_dashboard"."is_shared"
-  FROM "posthog_dashboard"
-  WHERE "posthog_dashboard"."id" = 2
+  SELECT "posthog_organization"."id",
+         "posthog_organization"."name",
+         "posthog_organization"."slug",
+         "posthog_organization"."logo_media_id",
+         "posthog_organization"."created_at",
+         "posthog_organization"."updated_at",
+         "posthog_organization"."plugins_access_level",
+         "posthog_organization"."for_internal_metrics",
+         "posthog_organization"."is_member_join_email_enabled",
+         "posthog_organization"."enforce_2fa",
+         "posthog_organization"."is_hipaa",
+         "posthog_organization"."customer_id",
+         "posthog_organization"."available_product_features",
+         "posthog_organization"."usage",
+         "posthog_organization"."never_drop_data",
+         "posthog_organization"."customer_trust_scores",
+         "posthog_organization"."setup_section_2_completed",
+         "posthog_organization"."personalization",
+         "posthog_organization"."domain_whitelist"
+  FROM "posthog_organization"
+  WHERE "posthog_organization"."id" = '00000000-0000-0000-0000-000000000000'::uuid
   LIMIT 21
   '''
 # ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.61
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.5
   '''
   SELECT "posthog_team"."id",
          "posthog_team"."uuid",
@@ -1714,6 +1161,8 @@
          "posthog_team"."has_completed_onboarding_for",
          "posthog_team"."ingested_event",
          "posthog_team"."autocapture_opt_out",
+         "posthog_team"."autocapture_web_vitals_opt_in",
+         "posthog_team"."autocapture_web_vitals_allowed_metrics",
          "posthog_team"."autocapture_exceptions_opt_in",
          "posthog_team"."autocapture_exceptions_errors_to_ignore",
          "posthog_team"."session_recording_opt_in",
@@ -1722,6 +1171,7 @@
          "posthog_team"."session_recording_linked_flag",
          "posthog_team"."session_recording_network_payload_capture_config",
          "posthog_team"."session_replay_config",
+         "posthog_team"."survey_config",
          "posthog_team"."capture_console_log_opt_in",
          "posthog_team"."capture_performance_opt_in",
          "posthog_team"."surveys_opt_in",
@@ -1745,13 +1195,6 @@
          "posthog_team"."modifiers",
          "posthog_team"."correlation_config",
          "posthog_team"."session_recording_retention_period_days",
-         "posthog_team"."plugins_opt_in",
-         "posthog_team"."opt_out_capture",
-         "posthog_team"."event_names",
-         "posthog_team"."event_names_with_usage",
-         "posthog_team"."event_properties",
-         "posthog_team"."event_properties_with_usage",
-         "posthog_team"."event_properties_numerical",
          "posthog_team"."external_data_workspace_id",
          "posthog_team"."external_data_workspace_last_synced_at"
   FROM "posthog_team"
@@ -1759,73 +1202,7 @@
   LIMIT 21
   '''
 # ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.62
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.63
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.64
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.65
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.66
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_V2_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.67
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:PERSON_ON_EVENTS_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.68
+# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.6
   '''
   SELECT "posthog_featureflag"."id",
          "posthog_featureflag"."key",
@@ -1843,71 +1220,11 @@
          "posthog_featureflag"."usage_dashboard_id",
          "posthog_featureflag"."has_enriched_analytics"
   FROM "posthog_featureflag"
-  WHERE ("posthog_featureflag"."active"
-         AND NOT "posthog_featureflag"."deleted"
+  WHERE (NOT "posthog_featureflag"."deleted"
+         AND "posthog_featureflag"."key" = 'copied-flag-key'
          AND "posthog_featureflag"."team_id" = 2)
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.69
-  '''
-  SELECT "posthog_team"."id",
-         "posthog_team"."uuid",
-         "posthog_team"."organization_id",
-         "posthog_team"."project_id",
-         "posthog_team"."api_token",
-         "posthog_team"."app_urls",
-         "posthog_team"."name",
-         "posthog_team"."slack_incoming_webhook",
-         "posthog_team"."created_at",
-         "posthog_team"."updated_at",
-         "posthog_team"."anonymize_ips",
-         "posthog_team"."completed_snippet_onboarding",
-         "posthog_team"."has_completed_onboarding_for",
-         "posthog_team"."ingested_event",
-         "posthog_team"."autocapture_opt_out",
-         "posthog_team"."autocapture_exceptions_opt_in",
-         "posthog_team"."autocapture_exceptions_errors_to_ignore",
-         "posthog_team"."session_recording_opt_in",
-         "posthog_team"."session_recording_sample_rate",
-         "posthog_team"."session_recording_minimum_duration_milliseconds",
-         "posthog_team"."session_recording_linked_flag",
-         "posthog_team"."session_recording_network_payload_capture_config",
-         "posthog_team"."session_replay_config",
-         "posthog_team"."capture_console_log_opt_in",
-         "posthog_team"."capture_performance_opt_in",
-         "posthog_team"."surveys_opt_in",
-         "posthog_team"."heatmaps_opt_in",
-         "posthog_team"."session_recording_version",
-         "posthog_team"."signup_token",
-         "posthog_team"."is_demo",
-         "posthog_team"."access_control",
-         "posthog_team"."week_start_day",
-         "posthog_team"."inject_web_apps",
-         "posthog_team"."test_account_filters",
-         "posthog_team"."test_account_filters_default_checked",
-         "posthog_team"."path_cleaning_filters",
-         "posthog_team"."timezone",
-         "posthog_team"."data_attributes",
-         "posthog_team"."person_display_name_properties",
-         "posthog_team"."live_events_columns",
-         "posthog_team"."recording_domains",
-         "posthog_team"."primary_dashboard_id",
-         "posthog_team"."extra_settings",
-         "posthog_team"."modifiers",
-         "posthog_team"."correlation_config",
-         "posthog_team"."session_recording_retention_period_days",
-         "posthog_team"."plugins_opt_in",
-         "posthog_team"."opt_out_capture",
-         "posthog_team"."event_names",
-         "posthog_team"."event_names_with_usage",
-         "posthog_team"."event_properties",
-         "posthog_team"."event_properties_with_usage",
-         "posthog_team"."event_properties_numerical",
-         "posthog_team"."external_data_workspace_id",
-         "posthog_team"."external_data_workspace_last_synced_at"
-  FROM "posthog_team"
-  WHERE "posthog_team"."id" = 2
-  LIMIT 21
+  ORDER BY "posthog_featureflag"."id" ASC
+  LIMIT 1
   '''
 # ---
 # name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.7
@@ -1920,88 +1237,6 @@
   LIMIT 1
   '''
 # ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.70
-  '''
-  SELECT "posthog_experiment"."id",
-         "posthog_experiment"."name",
-         "posthog_experiment"."description",
-         "posthog_experiment"."team_id",
-         "posthog_experiment"."filters",
-         "posthog_experiment"."parameters",
-         "posthog_experiment"."secondary_metrics",
-         "posthog_experiment"."created_by_id",
-         "posthog_experiment"."feature_flag_id",
-         "posthog_experiment"."exposure_cohort_id",
-         "posthog_experiment"."start_date",
-         "posthog_experiment"."end_date",
-         "posthog_experiment"."created_at",
-         "posthog_experiment"."updated_at",
-         "posthog_experiment"."archived"
-  FROM "posthog_experiment"
-  WHERE "posthog_experiment"."feature_flag_id" = 2
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.71
-  '''
-  SELECT "posthog_survey"."id",
-         "posthog_survey"."team_id",
-         "posthog_survey"."name",
-         "posthog_survey"."description",
-         "posthog_survey"."linked_flag_id",
-         "posthog_survey"."targeting_flag_id",
-         "posthog_survey"."type",
-         "posthog_survey"."conditions",
-         "posthog_survey"."questions",
-         "posthog_survey"."appearance",
-         "posthog_survey"."created_at",
-         "posthog_survey"."created_by_id",
-         "posthog_survey"."start_date",
-         "posthog_survey"."end_date",
-         "posthog_survey"."updated_at",
-         "posthog_survey"."archived",
-         "posthog_survey"."responses_limit"
-  FROM "posthog_survey"
-  WHERE "posthog_survey"."linked_flag_id" = 2
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.72
-  '''
-  SELECT "posthog_earlyaccessfeature"."id",
-         "posthog_earlyaccessfeature"."team_id",
-         "posthog_earlyaccessfeature"."feature_flag_id",
-         "posthog_earlyaccessfeature"."name",
-         "posthog_earlyaccessfeature"."description",
-         "posthog_earlyaccessfeature"."stage",
-         "posthog_earlyaccessfeature"."documentation_url",
-         "posthog_earlyaccessfeature"."created_at"
-  FROM "posthog_earlyaccessfeature"
-  WHERE "posthog_earlyaccessfeature"."feature_flag_id" = 2
-  '''
-# ---
-# name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.73
-  '''
-  SELECT "posthog_dashboard"."id",
-         "posthog_dashboard"."name",
-         "posthog_dashboard"."description",
-         "posthog_dashboard"."team_id",
-         "posthog_dashboard"."pinned",
-         "posthog_dashboard"."created_at",
-         "posthog_dashboard"."created_by_id",
-         "posthog_dashboard"."deleted",
-         "posthog_dashboard"."last_accessed_at",
-         "posthog_dashboard"."filters",
-         "posthog_dashboard"."creation_mode",
-         "posthog_dashboard"."restriction_level",
-         "posthog_dashboard"."deprecated_tags",
-         "posthog_dashboard"."tags",
-         "posthog_dashboard"."share_token",
-         "posthog_dashboard"."is_shared"
-  FROM "posthog_dashboard"
-  INNER JOIN "posthog_featureflagdashboards" ON ("posthog_dashboard"."id" = "posthog_featureflagdashboards"."dashboard_id")
-  WHERE (NOT ("posthog_dashboard"."deleted")
-         AND "posthog_featureflagdashboards"."feature_flag_id" = 2)
-  '''
-# ---
 # name: TestOrganizationFeatureFlagCopy.test_copy_feature_flag_create_new.8
   '''
   SELECT "posthog_featureflag"."id",
@@ -2250,35 +1485,3 @@
   LIMIT 21
   '''
 # ---
-# name: TestOrganizationFeatureFlagGet.test_get_feature_flag_success.7
-  '''
-  SELECT "posthog_user"."id",
-         "posthog_user"."password",
-         "posthog_user"."last_login",
-         "posthog_user"."first_name",
-         "posthog_user"."last_name",
-         "posthog_user"."is_staff",
-         "posthog_user"."is_active",
-         "posthog_user"."date_joined",
-         "posthog_user"."uuid",
-         "posthog_user"."current_organization_id",
-         "posthog_user"."current_team_id",
-         "posthog_user"."email",
-         "posthog_user"."pending_email",
-         "posthog_user"."temporary_token",
-         "posthog_user"."distinct_id",
-         "posthog_user"."is_email_verified",
-         "posthog_user"."requested_password_reset_at",
-         "posthog_user"."has_seen_product_intro_for",
-         "posthog_user"."strapi_id",
-         "posthog_user"."theme_mode",
-         "posthog_user"."partial_notification_settings",
-         "posthog_user"."anonymize_data",
-         "posthog_user"."toolbar_mode",
-         "posthog_user"."events_column_config",
-         "posthog_user"."email_opt_in"
-  FROM "posthog_user"
-  WHERE "posthog_user"."id" = 2
-  LIMIT 21
-  '''
-# ---
diff --git a/posthog/api/test/__snapshots__/test_person.ambr b/posthog/api/test/__snapshots__/test_person.ambr
index 21a4649e3dc8e..e210aca38191d 100644
--- a/posthog/api/test/__snapshots__/test_person.ambr
+++ b/posthog/api/test/__snapshots__/test_person.ambr
@@ -1,129 +1,4 @@
 # serializer version: 1
-# name: TestPerson.test_filter_person_email
-  '''
-  /* user_id:0 request:_snapshot_ */
-  SELECT id
-  FROM person
-  WHERE team_id = 2
-  GROUP BY id
-  HAVING max(is_deleted) = 0
-  AND argMax(person.created_at, version) < now() + INTERVAL 1 DAY
-  AND has(['another@gmail.com'], replaceRegexpAll(JSONExtractRaw(properties, 'email'), '^"|"$', ''))
-  ORDER BY argMax(person.created_at, version) DESC, id DESC
-  LIMIT 100 SETTINGS optimize_aggregation_in_order = 1
-  '''
-# ---
-# name: TestPerson.test_filter_person_email_materialized
-  '''
-  /* user_id:0 request:_snapshot_ */
-  SELECT id
-  FROM person
-  WHERE team_id = 2
-  GROUP BY id
-  HAVING max(is_deleted) = 0
-  AND argMax(person.created_at, version) < now() + INTERVAL 1 DAY
-  AND has(['another@gmail.com'], "pmat_email")
-  ORDER BY argMax(person.created_at, version) DESC, id DESC
-  LIMIT 100 SETTINGS optimize_aggregation_in_order = 1
-  '''
-# ---
-# name: TestPerson.test_filter_person_list
-  '''
-  /* user_id:0 request:_snapshot_ */
-  SELECT id
-  FROM person
-  WHERE team_id = 2
-  GROUP BY id
-  HAVING max(is_deleted) = 0
-  AND argMax(person.created_at, version) < now() + INTERVAL 1 DAY
-  AND id IN
-    (SELECT person_id
-     FROM
-       (SELECT distinct_id,
-               argMax(person_id, version) as person_id
-        FROM person_distinct_id2
-        WHERE team_id = 2
-        GROUP BY distinct_id
-        HAVING argMax(is_deleted, version) = 0)
-     where distinct_id = 'distinct_id' )
-  ORDER BY argMax(person.created_at, version) DESC, id DESC
-  LIMIT 100 SETTINGS optimize_aggregation_in_order = 1
-  '''
-# ---
-# name: TestPerson.test_filter_person_list.1
-  '''
-  /* user_id:0 request:_snapshot_ */
-  SELECT id
-  FROM person
-  WHERE team_id = 2
-  GROUP BY id
-  HAVING max(is_deleted) = 0
-  AND argMax(person.created_at, version) < now() + INTERVAL 1 DAY
-  AND id IN
-    (SELECT person_id
-     FROM
-       (SELECT distinct_id,
-               argMax(person_id, version) as person_id
-        FROM person_distinct_id2
-        WHERE team_id = 2
-        GROUP BY distinct_id
-        HAVING argMax(is_deleted, version) = 0)
-     where distinct_id = 'another_one' )
-  ORDER BY argMax(person.created_at, version) DESC, id DESC
-  LIMIT 100 SETTINGS optimize_aggregation_in_order = 1
-  '''
-# ---
-# name: TestPerson.test_filter_person_list.2
-  '''
-  /* user_id:0 request:_snapshot_ */
-  SELECT id
-  FROM person
-  WHERE team_id = 2
-  GROUP BY id
-  HAVING max(is_deleted) = 0
-  AND argMax(person.created_at, version) < now() + INTERVAL 1 DAY
-  AND has(['another@gmail.com'], replaceRegexpAll(JSONExtractRaw(properties, 'email'), '^"|"$', ''))
-  ORDER BY argMax(person.created_at, version) DESC, id DESC
-  LIMIT 100 SETTINGS optimize_aggregation_in_order = 1
-  '''
-# ---
-# name: TestPerson.test_filter_person_list.3
-  '''
-  /* user_id:0 request:_snapshot_ */
-  SELECT id
-  FROM person
-  WHERE team_id = 2
-  GROUP BY id
-  HAVING max(is_deleted) = 0
-  AND argMax(person.created_at, version) < now() + INTERVAL 1 DAY
-  AND has(['inexistent'], replaceRegexpAll(JSONExtractRaw(properties, 'email'), '^"|"$', ''))
-  ORDER BY argMax(person.created_at, version) DESC, id DESC
-  LIMIT 100 SETTINGS optimize_aggregation_in_order = 1
-  '''
-# ---
-# name: TestPerson.test_filter_person_list.4
-  '''
-  /* user_id:0 request:_snapshot_ */
-  SELECT id
-  FROM person
-  WHERE team_id = 2
-  GROUP BY id
-  HAVING max(is_deleted) = 0
-  AND argMax(person.created_at, version) < now() + INTERVAL 1 DAY
-  AND id IN
-    (SELECT person_id
-     FROM
-       (SELECT distinct_id,
-               argMax(person_id, version) as person_id
-        FROM person_distinct_id2
-        WHERE team_id = 2
-        GROUP BY distinct_id
-        HAVING argMax(is_deleted, version) = 0)
-     where distinct_id = 'inexistent' )
-  ORDER BY argMax(person.created_at, version) DESC, id DESC
-  LIMIT 100 SETTINGS optimize_aggregation_in_order = 1
-  '''
-# ---
 # name: TestPerson.test_filter_person_prop
   '''
   /* user_id:0 request:_snapshot_ */
@@ -531,131 +406,6 @@
   LIMIT 100 SETTINGS optimize_aggregation_in_order = 1
   '''
 # ---
-# name: TestPersonFromClickhouse.test_filter_person_email
-  '''
-  /* user_id:0 request:_snapshot_ */
-  SELECT id
-  FROM person
-  WHERE team_id = 2
-  GROUP BY id
-  HAVING max(is_deleted) = 0
-  AND argMax(person.created_at, version) < now() + INTERVAL 1 DAY
-  AND has(['another@gmail.com'], replaceRegexpAll(JSONExtractRaw(properties, 'email'), '^"|"$', ''))
-  ORDER BY argMax(person.created_at, version) DESC, id DESC
-  LIMIT 100 SETTINGS optimize_aggregation_in_order = 1
-  '''
-# ---
-# name: TestPersonFromClickhouse.test_filter_person_email_materialized
-  '''
-  /* user_id:0 request:_snapshot_ */
-  SELECT id
-  FROM person
-  WHERE team_id = 2
-  GROUP BY id
-  HAVING max(is_deleted) = 0
-  AND argMax(person.created_at, version) < now() + INTERVAL 1 DAY
-  AND has(['another@gmail.com'], "pmat_email")
-  ORDER BY argMax(person.created_at, version) DESC, id DESC
-  LIMIT 100 SETTINGS optimize_aggregation_in_order = 1
-  '''
-# ---
-# name: TestPersonFromClickhouse.test_filter_person_list
-  '''
-  /* user_id:0 request:_snapshot_ */
-  SELECT id
-  FROM person
-  WHERE team_id = 2
-  GROUP BY id
-  HAVING max(is_deleted) = 0
-  AND argMax(person.created_at, version) < now() + INTERVAL 1 DAY
-  AND id IN
-    (SELECT person_id
-     FROM
-       (SELECT distinct_id,
-               argMax(person_id, version) as person_id
-        FROM person_distinct_id2
-        WHERE team_id = 2
-        GROUP BY distinct_id
-        HAVING argMax(is_deleted, version) = 0)
-     where distinct_id = 'distinct_id' )
-  ORDER BY argMax(person.created_at, version) DESC, id DESC
-  LIMIT 100 SETTINGS optimize_aggregation_in_order = 1
-  '''
-# ---
-# name: TestPersonFromClickhouse.test_filter_person_list.1
-  '''
-  /* user_id:0 request:_snapshot_ */
-  SELECT id
-  FROM person
-  WHERE team_id = 2
-  GROUP BY id
-  HAVING max(is_deleted) = 0
-  AND argMax(person.created_at, version) < now() + INTERVAL 1 DAY
-  AND id IN
-    (SELECT person_id
-     FROM
-       (SELECT distinct_id,
-               argMax(person_id, version) as person_id
-        FROM person_distinct_id2
-        WHERE team_id = 2
-        GROUP BY distinct_id
-        HAVING argMax(is_deleted, version) = 0)
-     where distinct_id = 'another_one' )
-  ORDER BY argMax(person.created_at, version) DESC, id DESC
-  LIMIT 100 SETTINGS optimize_aggregation_in_order = 1
-  '''
-# ---
-# name: TestPersonFromClickhouse.test_filter_person_list.2
-  '''
-  /* user_id:0 request:_snapshot_ */
-  SELECT id
-  FROM person
-  WHERE team_id = 2
-  GROUP BY id
-  HAVING max(is_deleted) = 0
-  AND argMax(person.created_at, version) < now() + INTERVAL 1 DAY
-  AND has(['another@gmail.com'], replaceRegexpAll(JSONExtractRaw(properties, 'email'), '^"|"$', ''))
-  ORDER BY argMax(person.created_at, version) DESC, id DESC
-  LIMIT 100 SETTINGS optimize_aggregation_in_order = 1
-  '''
-# ---
-# name: TestPersonFromClickhouse.test_filter_person_list.3
-  '''
-  /* user_id:0 request:_snapshot_ */
-  SELECT id
-  FROM person
-  WHERE team_id = 2
-  GROUP BY id
-  HAVING max(is_deleted) = 0
-  AND argMax(person.created_at, version) < now() + INTERVAL 1 DAY
-  AND has(['inexistent'], replaceRegexpAll(JSONExtractRaw(properties, 'email'), '^"|"$', ''))
-  ORDER BY argMax(person.created_at, version) DESC, id DESC
-  LIMIT 100 SETTINGS optimize_aggregation_in_order = 1
-  '''
-# ---
-# name: TestPersonFromClickhouse.test_filter_person_list.4
-  '''
-  /* user_id:0 request:_snapshot_ */
-  SELECT id
-  FROM person
-  WHERE team_id = 2
-  GROUP BY id
-  HAVING max(is_deleted) = 0
-  AND argMax(person.created_at, version) < now() + INTERVAL 1 DAY
-  AND id IN
-    (SELECT person_id
-     FROM
-       (SELECT distinct_id,
-               argMax(person_id, version) as person_id
-        FROM person_distinct_id2
-        WHERE team_id = 2
-        GROUP BY distinct_id
-        HAVING argMax(is_deleted, version) = 0)
-     where distinct_id = 'inexistent' )
-  ORDER BY argMax(person.created_at, version) DESC, id DESC
-  LIMIT 100 SETTINGS optimize_aggregation_in_order = 1
-  '''
-# ---
 # name: TestPersonFromClickhouse.test_filter_person_prop
   '''
   /* user_id:0 request:_snapshot_ */
diff --git a/posthog/api/test/__snapshots__/test_preflight.ambr b/posthog/api/test/__snapshots__/test_preflight.ambr
index e6642ac4aee62..bb2d9023a2401 100644
--- a/posthog/api/test/__snapshots__/test_preflight.ambr
+++ b/posthog/api/test/__snapshots__/test_preflight.ambr
@@ -96,65 +96,3 @@
   LIMIT 21
   '''
 # ---
-# name: TestPreflight.test_cloud_preflight_limited_db_queries.2
-  '''
-  SELECT "posthog_team"."id",
-         "posthog_team"."uuid",
-         "posthog_team"."organization_id",
-         "posthog_team"."project_id",
-         "posthog_team"."api_token",
-         "posthog_team"."app_urls",
-         "posthog_team"."name",
-         "posthog_team"."slack_incoming_webhook",
-         "posthog_team"."created_at",
-         "posthog_team"."updated_at",
-         "posthog_team"."anonymize_ips",
-         "posthog_team"."completed_snippet_onboarding",
-         "posthog_team"."has_completed_onboarding_for",
-         "posthog_team"."ingested_event",
-         "posthog_team"."autocapture_opt_out",
-         "posthog_team"."autocapture_exceptions_opt_in",
-         "posthog_team"."autocapture_exceptions_errors_to_ignore",
-         "posthog_team"."session_recording_opt_in",
-         "posthog_team"."session_recording_sample_rate",
-         "posthog_team"."session_recording_minimum_duration_milliseconds",
-         "posthog_team"."session_recording_linked_flag",
-         "posthog_team"."session_recording_network_payload_capture_config",
-         "posthog_team"."session_replay_config",
-         "posthog_team"."capture_console_log_opt_in",
-         "posthog_team"."capture_performance_opt_in",
-         "posthog_team"."surveys_opt_in",
-         "posthog_team"."heatmaps_opt_in",
-         "posthog_team"."session_recording_version",
-         "posthog_team"."signup_token",
-         "posthog_team"."is_demo",
-         "posthog_team"."access_control",
-         "posthog_team"."week_start_day",
-         "posthog_team"."inject_web_apps",
-         "posthog_team"."test_account_filters",
-         "posthog_team"."test_account_filters_default_checked",
-         "posthog_team"."path_cleaning_filters",
-         "posthog_team"."timezone",
-         "posthog_team"."data_attributes",
-         "posthog_team"."person_display_name_properties",
-         "posthog_team"."live_events_columns",
-         "posthog_team"."recording_domains",
-         "posthog_team"."primary_dashboard_id",
-         "posthog_team"."extra_settings",
-         "posthog_team"."modifiers",
-         "posthog_team"."correlation_config",
-         "posthog_team"."session_recording_retention_period_days",
-         "posthog_team"."plugins_opt_in",
-         "posthog_team"."opt_out_capture",
-         "posthog_team"."event_names",
-         "posthog_team"."event_names_with_usage",
-         "posthog_team"."event_properties",
-         "posthog_team"."event_properties_with_usage",
-         "posthog_team"."event_properties_numerical",
-         "posthog_team"."external_data_workspace_id",
-         "posthog_team"."external_data_workspace_last_synced_at"
-  FROM "posthog_team"
-  WHERE "posthog_team"."id" = 2
-  LIMIT 21
-  '''
-# ---
diff --git a/posthog/api/test/notebooks/__snapshots__/test_notebook.ambr b/posthog/api/test/notebooks/__snapshots__/test_notebook.ambr
index d59c1815c0042..8861241214a3b 100644
--- a/posthog/api/test/notebooks/__snapshots__/test_notebook.ambr
+++ b/posthog/api/test/notebooks/__snapshots__/test_notebook.ambr
@@ -266,71 +266,6 @@
   LIMIT 2
   '''
 # ---
-# name: TestNotebooks.test_updates_notebook.15
-  '''
-  SELECT "posthog_instancesetting"."id",
-         "posthog_instancesetting"."key",
-         "posthog_instancesetting"."raw_value"
-  FROM "posthog_instancesetting"
-  WHERE "posthog_instancesetting"."key" = 'constance:posthog:RATE_LIMIT_ENABLED'
-  ORDER BY "posthog_instancesetting"."id" ASC
-  LIMIT 1
-  '''
-# ---
-# name: TestNotebooks.test_updates_notebook.16
-  '''
-  SELECT COUNT(*) AS "__count"
-  FROM "posthog_activitylog"
-  WHERE ("posthog_activitylog"."scope" = 'Notebook'
-         AND "posthog_activitylog"."team_id" = 2)
-  '''
-# ---
-# name: TestNotebooks.test_updates_notebook.17
-  '''
-  SELECT "posthog_activitylog"."id",
-         "posthog_activitylog"."team_id",
-         "posthog_activitylog"."organization_id",
-         "posthog_activitylog"."user_id",
-         "posthog_activitylog"."was_impersonated",
-         "posthog_activitylog"."is_system",
-         "posthog_activitylog"."activity",
-         "posthog_activitylog"."item_id",
-         "posthog_activitylog"."scope",
-         "posthog_activitylog"."detail",
-         "posthog_activitylog"."created_at",
-         "posthog_user"."id",
-         "posthog_user"."password",
-         "posthog_user"."last_login",
-         "posthog_user"."first_name",
-         "posthog_user"."last_name",
-         "posthog_user"."is_staff",
-         "posthog_user"."is_active",
-         "posthog_user"."date_joined",
-         "posthog_user"."uuid",
-         "posthog_user"."current_organization_id",
-         "posthog_user"."current_team_id",
-         "posthog_user"."email",
-         "posthog_user"."pending_email",
-         "posthog_user"."temporary_token",
-         "posthog_user"."distinct_id",
-         "posthog_user"."is_email_verified",
-         "posthog_user"."requested_password_reset_at",
-         "posthog_user"."has_seen_product_intro_for",
-         "posthog_user"."strapi_id",
-         "posthog_user"."theme_mode",
-         "posthog_user"."partial_notification_settings",
-         "posthog_user"."anonymize_data",
-         "posthog_user"."toolbar_mode",
-         "posthog_user"."events_column_config",
-         "posthog_user"."email_opt_in"
-  FROM "posthog_activitylog"
-  LEFT OUTER JOIN "posthog_user" ON ("posthog_activitylog"."user_id" = "posthog_user"."id")
-  WHERE ("posthog_activitylog"."scope" = 'Notebook'
-         AND "posthog_activitylog"."team_id" = 2)
-  ORDER BY "posthog_activitylog"."created_at" DESC
-  LIMIT 2
-  '''
-# ---
 # name: TestNotebooks.test_updates_notebook.2
   '''
   SELECT "posthog_organizationmembership"."id",
diff --git a/posthog/async_migrations/test/__snapshots__/test_0004_replicated_schema.ambr b/posthog/async_migrations/test/__snapshots__/test_0004_replicated_schema.ambr
deleted file mode 100644
index f9eaffaf44db6..0000000000000
--- a/posthog/async_migrations/test/__snapshots__/test_0004_replicated_schema.ambr
+++ /dev/null
@@ -1,228 +0,0 @@
-# name: Test0004ReplicatedSchema.test_migration
-  <class 'tuple'> (
-    'cohortpeople',
-    "ReplicatedCollapsingMergeTree('/clickhouse/tables/am0004_20220201000000_noshard/posthog.cohortpeople', '{replica}-{shard}', sign) ORDER BY (team_id, cohort_id, person_id, version) SETTINGS index_granularity = 8192",
-  )
----
-# name: Test0004ReplicatedSchema.test_migration.1
-  <class 'tuple'> (
-    'events',
-    "Distributed('posthog', 'posthog_test', 'sharded_events', sipHash64(distinct_id))",
-  )
----
-# name: Test0004ReplicatedSchema.test_migration.10
-  <class 'tuple'> (
-    'kafka_plugin_log_entries',
-    "Kafka('kafka:9092', 'plugin_log_entries_test', 'group1', 'JSONEachRow')",
-  )
----
-# name: Test0004ReplicatedSchema.test_migration.11
-  <class 'tuple'> (
-    'kafka_session_recording_events',
-    "Kafka('kafka:9092', 'clickhouse_session_recording_events_test', 'group1', 'JSONEachRow')",
-  )
----
-# name: Test0004ReplicatedSchema.test_migration.12
-  <class 'tuple'> (
-    'person',
-    "ReplicatedReplacingMergeTree('/clickhouse/tables/am0004_20220201000000_noshard/posthog.person', '{replica}-{shard}', version) ORDER BY (team_id, id) SETTINGS index_granularity = 8192",
-  )
----
-# name: Test0004ReplicatedSchema.test_migration.13
-  <class 'tuple'> (
-    'person_distinct_id2',
-    "ReplicatedReplacingMergeTree('/clickhouse/tables/am0004_20220201000000_noshard/posthog.person_distinct_id2', '{replica}-{shard}', version) ORDER BY (team_id, distinct_id) SETTINGS index_granularity = 512",
-  )
----
-# name: Test0004ReplicatedSchema.test_migration.14
-  <class 'tuple'> (
-    'person_static_cohort',
-    "ReplicatedReplacingMergeTree('/clickhouse/tables/am0004_20220201000000_noshard/posthog.person_static_cohort', '{replica}-{shard}', _timestamp) ORDER BY (team_id, cohort_id, person_id, id) SETTINGS index_granularity = 8192",
-  )
----
-# name: Test0004ReplicatedSchema.test_migration.15
-  <class 'tuple'> (
-    'plugin_log_entries',
-    "ReplicatedReplacingMergeTree('/clickhouse/tables/am0004_20220201000000_noshard/posthog.plugin_log_entries', '{replica}-{shard}', _timestamp) PARTITION BY plugin_id ORDER BY (team_id, id) SETTINGS index_granularity = 512",
-  )
----
-# name: Test0004ReplicatedSchema.test_migration.16
-  <class 'tuple'> (
-    'session_recording_events',
-    "Distributed('posthog', 'posthog_test', 'sharded_session_recording_events', sipHash64(distinct_id))",
-  )
----
-# name: Test0004ReplicatedSchema.test_migration.17
-  <class 'tuple'> (
-    'sharded_events',
-    "ReplicatedReplacingMergeTree('/clickhouse/tables/am0004_20220201000000_{shard}/posthog.events', '{replica}', _timestamp) PARTITION BY toYYYYMM(timestamp) ORDER BY (team_id, toDate(timestamp), event, cityHash64(distinct_id), cityHash64(uuid)) SAMPLE BY cityHash64(distinct_id) SETTINGS index_granularity = 8192",
-  )
----
-# name: Test0004ReplicatedSchema.test_migration.18
-  <class 'tuple'> (
-    'sharded_session_recording_events',
-    "ReplicatedReplacingMergeTree('/clickhouse/tables/am0004_20220201000000_{shard}/posthog.session_recording_events', '{replica}', _timestamp) PARTITION BY toYYYYMMDD(timestamp) ORDER BY (team_id, toHour(timestamp), session_id, timestamp, uuid) SETTINGS index_granularity = 512",
-  )
----
-# name: Test0004ReplicatedSchema.test_migration.19
-  <class 'tuple'> (
-    'writable_events',
-    "Distributed('posthog', 'posthog_test', 'sharded_events', sipHash64(distinct_id))",
-  )
----
-# name: Test0004ReplicatedSchema.test_migration.2
-  <class 'tuple'> (
-    'events_dead_letter_queue',
-    "ReplicatedReplacingMergeTree('/clickhouse/tables/am0004_20220201000000_noshard/posthog.events_dead_letter_queue', '{replica}-{shard}', _timestamp) ORDER BY (id, event_uuid, distinct_id, team_id) SETTINGS index_granularity = 512",
-  )
----
-# name: Test0004ReplicatedSchema.test_migration.20
-  <class 'tuple'> (
-    'writable_session_recording_events',
-    "Distributed('posthog', 'posthog_test', 'sharded_session_recording_events', sipHash64(distinct_id))",
-  )
----
-# name: Test0004ReplicatedSchema.test_migration.3
-  <class 'tuple'> (
-    'groups',
-    "ReplicatedReplacingMergeTree('/clickhouse/tables/am0004_20220201000000_noshard/posthog.groups', '{replica}-{shard}', _timestamp) ORDER BY (team_id, group_type_index, group_key) SETTINGS index_granularity = 8192",
-  )
----
-# name: Test0004ReplicatedSchema.test_migration.4
-  <class 'tuple'> (
-    'kafka_events',
-    "Kafka SETTINGS kafka_broker_list = 'kafka:9092', kafka_topic_list = 'clickhouse_events_proto_test', kafka_group_name = 'group1', kafka_format = 'Protobuf', kafka_schema = 'events:Event', kafka_skip_broken_messages = 100",
-  )
----
-# name: Test0004ReplicatedSchema.test_migration.5
-  <class 'tuple'> (
-    'kafka_events_dead_letter_queue',
-    "Kafka('kafka:9092', 'events_dead_letter_queue_test', 'group1', 'JSONEachRow') SETTINGS kafka_skip_broken_messages = 1000",
-  )
----
-# name: Test0004ReplicatedSchema.test_migration.6
-  <class 'tuple'> (
-    'kafka_events_json',
-    "Kafka('kafka:9092', 'clickhouse_events_json_test', 'group1', 'JSONEachRow') SETTINGS kafka_skip_broken_messages = 100",
-  )
----
-# name: Test0004ReplicatedSchema.test_migration.7
-  <class 'tuple'> (
-    'kafka_groups',
-    "Kafka('kafka:9092', 'clickhouse_groups_test', 'group1', 'JSONEachRow')",
-  )
----
-# name: Test0004ReplicatedSchema.test_migration.8
-  <class 'tuple'> (
-    'kafka_person',
-    "Kafka('kafka:9092', 'clickhouse_person_test', 'group1', 'JSONEachRow')",
-  )
----
-# name: Test0004ReplicatedSchema.test_migration.9
-  <class 'tuple'> (
-    'kafka_person_distinct_id2',
-    "Kafka('kafka:9092', 'clickhouse_person_distinct_id_test', 'group1', 'JSONEachRow')",
-  )
----
-# name: Test0004ReplicatedSchema.test_rollback
-  <class 'tuple'> (
-    'cohortpeople',
-    'CollapsingMergeTree(sign) ORDER BY (team_id, cohort_id, person_id, version) SETTINGS index_granularity = 8192',
-  )
----
-# name: Test0004ReplicatedSchema.test_rollback.1
-  <class 'tuple'> (
-    'events',
-    'ReplacingMergeTree(_timestamp) PARTITION BY toYYYYMM(timestamp) ORDER BY (team_id, toDate(timestamp), event, cityHash64(distinct_id), cityHash64(uuid)) SAMPLE BY cityHash64(distinct_id) SETTINGS index_granularity = 8192',
-  )
----
-# name: Test0004ReplicatedSchema.test_rollback.10
-  <class 'tuple'> (
-    'kafka_plugin_log_entries',
-    "Kafka('kafka:9092', 'plugin_log_entries_test', 'group1', 'JSONEachRow')",
-  )
----
-# name: Test0004ReplicatedSchema.test_rollback.11
-  <class 'tuple'> (
-    'kafka_session_recording_events',
-    "Kafka('kafka:9092', 'clickhouse_session_recording_events_test', 'group1', 'JSONEachRow')",
-  )
----
-# name: Test0004ReplicatedSchema.test_rollback.12
-  <class 'tuple'> (
-    'person',
-    'ReplacingMergeTree(version) ORDER BY (team_id, id) SETTINGS index_granularity = 8192',
-  )
----
-# name: Test0004ReplicatedSchema.test_rollback.13
-  <class 'tuple'> (
-    'person_distinct_id2',
-    'ReplacingMergeTree(version) ORDER BY (team_id, distinct_id) SETTINGS index_granularity = 512',
-  )
----
-# name: Test0004ReplicatedSchema.test_rollback.14
-  <class 'tuple'> (
-    'person_static_cohort',
-    'ReplacingMergeTree(_timestamp) ORDER BY (team_id, cohort_id, person_id, id) SETTINGS index_granularity = 8192',
-  )
----
-# name: Test0004ReplicatedSchema.test_rollback.15
-  <class 'tuple'> (
-    'plugin_log_entries',
-    'ReplacingMergeTree(_timestamp) PARTITION BY plugin_id ORDER BY (team_id, id) SETTINGS index_granularity = 512',
-  )
----
-# name: Test0004ReplicatedSchema.test_rollback.16
-  <class 'tuple'> (
-    'session_recording_events',
-    'ReplacingMergeTree(_timestamp) PARTITION BY toYYYYMMDD(timestamp) ORDER BY (team_id, toHour(timestamp), session_id, timestamp, uuid) SETTINGS index_granularity = 512',
-  )
----
-# name: Test0004ReplicatedSchema.test_rollback.2
-  <class 'tuple'> (
-    'events_dead_letter_queue',
-    'ReplacingMergeTree(_timestamp) ORDER BY (id, event_uuid, distinct_id, team_id) SETTINGS index_granularity = 512',
-  )
----
-# name: Test0004ReplicatedSchema.test_rollback.3
-  <class 'tuple'> (
-    'groups',
-    'ReplacingMergeTree(_timestamp) ORDER BY (team_id, group_type_index, group_key) SETTINGS index_granularity = 8192',
-  )
----
-# name: Test0004ReplicatedSchema.test_rollback.4
-  <class 'tuple'> (
-    'kafka_events',
-    "Kafka SETTINGS kafka_broker_list = 'kafka:9092', kafka_topic_list = 'clickhouse_events_proto_test', kafka_group_name = 'group1', kafka_format = 'Protobuf', kafka_schema = 'events:Event', kafka_skip_broken_messages = 100",
-  )
----
-# name: Test0004ReplicatedSchema.test_rollback.5
-  <class 'tuple'> (
-    'kafka_events_dead_letter_queue',
-    "Kafka('kafka:9092', 'events_dead_letter_queue_test', 'group1', 'JSONEachRow') SETTINGS kafka_skip_broken_messages = 1000",
-  )
----
-# name: Test0004ReplicatedSchema.test_rollback.6
-  <class 'tuple'> (
-    'kafka_events_json',
-    "Kafka('kafka:9092', 'clickhouse_events_json_test', 'group1', 'JSONEachRow') SETTINGS kafka_skip_broken_messages = 100",
-  )
----
-# name: Test0004ReplicatedSchema.test_rollback.7
-  <class 'tuple'> (
-    'kafka_groups',
-    "Kafka('kafka:9092', 'clickhouse_groups_test', 'group1', 'JSONEachRow')",
-  )
----
-# name: Test0004ReplicatedSchema.test_rollback.8
-  <class 'tuple'> (
-    'kafka_person',
-    "Kafka('kafka:9092', 'clickhouse_person_test', 'group1', 'JSONEachRow')",
-  )
----
-# name: Test0004ReplicatedSchema.test_rollback.9
-  <class 'tuple'> (
-    'kafka_person_distinct_id2',
-    "Kafka('kafka:9092', 'clickhouse_person_distinct_id_test', 'group1', 'JSONEachRow')",
-  )
----
diff --git a/posthog/async_migrations/test/__snapshots__/test_0005_person_collapsed_by_version.ambr b/posthog/async_migrations/test/__snapshots__/test_0005_person_collapsed_by_version.ambr
deleted file mode 100644
index b186f3f52ea3b..0000000000000
--- a/posthog/async_migrations/test/__snapshots__/test_0005_person_collapsed_by_version.ambr
+++ /dev/null
@@ -1,80 +0,0 @@
-# name: Test0005PersonCollapsedByVersion.test_migration_schema
-  '
-  CREATE TABLE posthog_test.kafka_person
-  (
-      `id` UUID,
-      `created_at` DateTime64(3),
-      `team_id` Int64,
-      `properties` String,
-      `is_identified` Int8,
-      `is_deleted` Int8 DEFAULT 0,
-      `version` UInt64
-  )
-  ENGINE = Kafka('kafka:9092', 'clickhouse_person_test', 'group1', 'JSONEachRow')
-  '
----
-# name: Test0005PersonCollapsedByVersion.test_migration_schema.1
-  '
-  CREATE TABLE posthog_test.person
-  (
-      `id` UUID,
-      `created_at` DateTime64(3),
-      `team_id` Int64,
-      `properties` String,
-      `is_identified` Int8,
-      `is_deleted` Int8 DEFAULT 0,
-      `version` UInt64,
-      `_timestamp` DateTime,
-      `_offset` UInt64
-  )
-  ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/am0005_20220601000000_noshard/posthog.person', '{replica}-{shard}', version)
-  ORDER BY (team_id, id)
-  SETTINGS index_granularity = 8192
-  '
----
-# name: Test0005PersonCollapsedByVersion.test_migration_schema.2
-  '
-  CREATE TABLE posthog_test.person_backup_0005_person_collapsed_by_version
-  (
-      `id` UUID,
-      `created_at` DateTime64(3),
-      `team_id` Int64,
-      `properties` String,
-      `is_identified` Int8,
-      `is_deleted` Int8 DEFAULT 0,
-      `version` UInt64,
-      `_timestamp` DateTime,
-      `_offset` UInt64
-  )
-  ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/00000000-0000-0000-0000-000000000000-noshard/posthog.person', '{replica}-{shard}', _timestamp)
-  ORDER BY (team_id, id)
-  SETTINGS index_granularity = 819
-  '
----
-# name: Test0005PersonCollapsedByVersion.test_migration_schema.3
-  '
-  CREATE MATERIALIZED VIEW posthog_test.person_mv TO posthog_test.person
-  (
-      `id` UUID,
-      `created_at` DateTime64(3),
-      `team_id` Int64,
-      `properties` String,
-      `is_identified` Int8,
-      `is_deleted` Int8,
-      `version` UInt64,
-      `_timestamp` Nullable(DateTime),
-      `_offset` UInt64
-  ) AS
-  SELECT
-      id,
-      created_at,
-      team_id,
-      properties,
-      is_identified,
-      is_deleted,
-      version,
-      _timestamp,
-      _offset
-  FROM posthog_test.kafka_person
-  '
----
diff --git a/posthog/async_migrations/test/__snapshots__/test_0005_person_replacing_by_version.ambr b/posthog/async_migrations/test/__snapshots__/test_0005_person_replacing_by_version.ambr
deleted file mode 100644
index 8498541d5e6ae..0000000000000
--- a/posthog/async_migrations/test/__snapshots__/test_0005_person_replacing_by_version.ambr
+++ /dev/null
@@ -1,80 +0,0 @@
-# name: Test0005PersonCollapsedByVersion.test_migration_schema
-  '
-  CREATE TABLE posthog_test.kafka_person
-  (
-      `id` UUID,
-      `created_at` DateTime64(3),
-      `team_id` Int64,
-      `properties` String,
-      `is_identified` Int8,
-      `is_deleted` Int8 DEFAULT 0,
-      `version` UInt64
-  )
-  ENGINE = Kafka('kafka:9092', 'clickhouse_person_test', 'group1', 'JSONEachRow')
-  '
----
-# name: Test0005PersonCollapsedByVersion.test_migration_schema.1
-  '
-  CREATE TABLE posthog_test.person
-  (
-      `id` UUID,
-      `created_at` DateTime64(3),
-      `team_id` Int64,
-      `properties` String,
-      `is_identified` Int8,
-      `is_deleted` Int8 DEFAULT 0,
-      `version` UInt64,
-      `_timestamp` DateTime,
-      `_offset` UInt64
-  )
-  ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/am0005_20220601000000_noshard/posthog.person', '{replica}-{shard}', version)
-  ORDER BY (team_id, id)
-  SETTINGS index_granularity = 8192
-  '
----
-# name: Test0005PersonCollapsedByVersion.test_migration_schema.2
-  '
-  CREATE TABLE posthog_test.person_backup_0005_person_replacing_by_version
-  (
-      `id` UUID,
-      `created_at` DateTime64(3),
-      `team_id` Int64,
-      `properties` String,
-      `is_identified` Int8,
-      `is_deleted` Int8 DEFAULT 0,
-      `version` UInt64,
-      `_timestamp` DateTime,
-      `_offset` UInt64
-  )
-  ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/00000000-0000-0000-0000-000000000000-noshard/posthog.person', '{replica}-{shard}', _timestamp)
-  ORDER BY (team_id, id)
-  SETTINGS index_granularity = 819
-  '
----
-# name: Test0005PersonCollapsedByVersion.test_migration_schema.3
-  '
-  CREATE MATERIALIZED VIEW posthog_test.person_mv TO posthog_test.person
-  (
-      `id` UUID,
-      `created_at` DateTime64(3),
-      `team_id` Int64,
-      `properties` String,
-      `is_identified` Int8,
-      `is_deleted` Int8,
-      `version` UInt64,
-      `_timestamp` Nullable(DateTime),
-      `_offset` UInt64
-  ) AS
-  SELECT
-      id,
-      created_at,
-      team_id,
-      properties,
-      is_identified,
-      is_deleted,
-      version,
-      _timestamp,
-      _offset
-  FROM posthog_test.kafka_person
-  '
----
diff --git a/posthog/clickhouse/test/__snapshots__/test_schema.ambr b/posthog/clickhouse/test/__snapshots__/test_schema.ambr
deleted file mode 100644
index ae394429f94b6..0000000000000
--- a/posthog/clickhouse/test/__snapshots__/test_schema.ambr
+++ /dev/null
@@ -1,3721 +0,0 @@
-# serializer version: 1
-# name: test_create_kafka_events_with_disabled_protobuf
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_events_json ON CLUSTER 'posthog'
-  (
-      uuid UUID,
-      event VARCHAR,
-      properties VARCHAR CODEC(ZSTD(3)),
-      timestamp DateTime64(6, 'UTC'),
-      team_id Int64,
-      distinct_id VARCHAR,
-      elements_chain VARCHAR,
-      created_at DateTime64(6, 'UTC'),
-      person_id UUID,
-      person_created_at DateTime64,
-      person_properties VARCHAR Codec(ZSTD(3)),
-      group0_properties VARCHAR Codec(ZSTD(3)),
-      group1_properties VARCHAR Codec(ZSTD(3)),
-      group2_properties VARCHAR Codec(ZSTD(3)),
-      group3_properties VARCHAR Codec(ZSTD(3)),
-      group4_properties VARCHAR Codec(ZSTD(3)),
-      group0_created_at DateTime64,
-      group1_created_at DateTime64,
-      group2_created_at DateTime64,
-      group3_created_at DateTime64,
-      group4_created_at DateTime64,
-      person_mode Enum8('full' = 0, 'propertyless' = 1, 'force_upgrade' = 2)
-      
-      
-      
-  ) ENGINE = Kafka('kafka:9092', 'clickhouse_events_json_test', 'group1', 'JSONEachRow')
-  
-      SETTINGS kafka_skip_broken_messages = 100
-  
-  '''
-# ---
-# name: test_create_kafka_table_with_different_kafka_host[kafka_app_metrics2]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_app_metrics2 ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      timestamp DateTime64(6, 'UTC'),
-      app_source LowCardinality(String),
-      app_source_id String,
-      instance_id String,
-      metric_kind String,
-      metric_name String,
-      count Int64
-  )
-  ENGINE=Kafka('test.kafka.broker:9092', 'clickhouse_app_metrics2_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_kafka_table_with_different_kafka_host[kafka_app_metrics]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_app_metrics ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      timestamp DateTime64(6, 'UTC'),
-      plugin_config_id Int64,
-      category LowCardinality(String),
-      job_id String,
-      successes Int64,
-      successes_on_retry Int64,
-      failures Int64,
-      error_uuid UUID,
-      error_type String,
-      error_details String CODEC(ZSTD(3))
-  )
-  ENGINE=Kafka('test.kafka.broker:9092', 'clickhouse_app_metrics_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_kafka_table_with_different_kafka_host[kafka_events_dead_letter_queue]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_events_dead_letter_queue ON CLUSTER 'posthog'
-  (
-      id UUID,
-      event_uuid UUID,
-      event VARCHAR,
-      properties VARCHAR,
-      distinct_id VARCHAR,
-      team_id Int64,
-      elements_chain VARCHAR,
-      created_at DateTime64(6, 'UTC'),
-      ip VARCHAR,
-      site_url VARCHAR,
-      now DateTime64(6, 'UTC'),
-      raw_payload VARCHAR,
-      error_timestamp DateTime64(6, 'UTC'),
-      error_location VARCHAR,
-      error VARCHAR,
-      tags Array(VARCHAR)
-      
-  ) ENGINE = Kafka('test.kafka.broker:9092', 'events_dead_letter_queue_test', 'group1', 'JSONEachRow')
-   SETTINGS kafka_skip_broken_messages=1000
-  '''
-# ---
-# name: test_create_kafka_table_with_different_kafka_host[kafka_events_json]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_events_json ON CLUSTER 'posthog'
-  (
-      uuid UUID,
-      event VARCHAR,
-      properties VARCHAR CODEC(ZSTD(3)),
-      timestamp DateTime64(6, 'UTC'),
-      team_id Int64,
-      distinct_id VARCHAR,
-      elements_chain VARCHAR,
-      created_at DateTime64(6, 'UTC'),
-      person_id UUID,
-      person_created_at DateTime64,
-      person_properties VARCHAR Codec(ZSTD(3)),
-      group0_properties VARCHAR Codec(ZSTD(3)),
-      group1_properties VARCHAR Codec(ZSTD(3)),
-      group2_properties VARCHAR Codec(ZSTD(3)),
-      group3_properties VARCHAR Codec(ZSTD(3)),
-      group4_properties VARCHAR Codec(ZSTD(3)),
-      group0_created_at DateTime64,
-      group1_created_at DateTime64,
-      group2_created_at DateTime64,
-      group3_created_at DateTime64,
-      group4_created_at DateTime64,
-      person_mode Enum8('full' = 0, 'propertyless' = 1, 'force_upgrade' = 2)
-      
-      
-      
-  ) ENGINE = Kafka('test.kafka.broker:9092', 'clickhouse_events_json_test', 'group1', 'JSONEachRow')
-  
-      SETTINGS kafka_skip_broken_messages = 100
-  
-  '''
-# ---
-# name: test_create_kafka_table_with_different_kafka_host[kafka_groups]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_groups ON CLUSTER 'posthog'
-  (
-      group_type_index UInt8,
-      group_key VARCHAR,
-      created_at DateTime64,
-      team_id Int64,
-      group_properties VARCHAR
-      
-  ) ENGINE = Kafka('test.kafka.broker:9092', 'clickhouse_groups_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_kafka_table_with_different_kafka_host[kafka_heatmaps]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_heatmaps ON CLUSTER 'posthog'
-  (
-      session_id VARCHAR,
-      team_id Int64,
-      distinct_id VARCHAR,
-      timestamp DateTime64(6, 'UTC'),
-      -- x is the x with resolution applied, the resolution converts high fidelity mouse positions into an NxN grid
-      x Int16,
-      -- y is the y with resolution applied, the resolution converts high fidelity mouse positions into an NxN grid
-      y Int16,
-      -- stored so that in future we can support other resolutions
-      scale_factor Int16,
-      viewport_width Int16,
-      viewport_height Int16,
-      -- some elements move when the page scrolls, others do not
-      pointer_target_fixed Bool,
-      current_url VARCHAR,
-      type LowCardinality(String)
-  ) ENGINE = Kafka('test.kafka.broker:9092', 'clickhouse_heatmap_events_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_kafka_table_with_different_kafka_host[kafka_ingestion_warnings]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_ingestion_warnings ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      source LowCardinality(VARCHAR),
-      type VARCHAR,
-      details VARCHAR CODEC(ZSTD(3)),
-      timestamp DateTime64(6, 'UTC')
-      
-  ) ENGINE = Kafka('test.kafka.broker:9092', 'clickhouse_ingestion_warnings_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_kafka_table_with_different_kafka_host[kafka_log_entries]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_log_entries ON CLUSTER 'posthog'
-  (
-      team_id UInt64,
-      -- The name of the service or product that generated the logs.
-      -- Examples: batch_exports
-      log_source LowCardinality(String),
-      -- An id for the log source.
-      -- Set log_source to avoid collision with ids from other log sources if the id generation is not safe.
-      -- Examples: A batch export id, a cronjob id, a plugin id.
-      log_source_id String,
-      -- A secondary id e.g. for the instance of log_source that generated this log.
-      -- This may be ommitted if log_source is a singleton.
-      -- Examples: A batch export run id, a plugin_config id, a thread id, a process id, a machine id.
-      instance_id String,
-      -- Timestamp indicating when the log was generated.
-      timestamp DateTime64(6, 'UTC'),
-      -- The log level.
-      -- Examples: INFO, WARNING, DEBUG, ERROR.
-      level LowCardinality(String),
-      -- The actual log message.
-      message String
-      
-  ) ENGINE = Kafka('test.kafka.broker:9092', 'log_entries_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_kafka_table_with_different_kafka_host[kafka_performance_events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_performance_events ON CLUSTER 'posthog'
-  (
-      uuid UUID,
-  session_id String,
-  window_id String,
-  pageview_id String,
-  distinct_id String,
-  timestamp DateTime64,
-  time_origin DateTime64(3, 'UTC'),
-  entry_type LowCardinality(String),
-  name String,
-  team_id Int64,
-  current_url String,
-  start_time Float64,
-  duration Float64,
-  redirect_start Float64,
-  redirect_end Float64,
-  worker_start Float64,
-  fetch_start Float64,
-  domain_lookup_start Float64,
-  domain_lookup_end Float64,
-  connect_start Float64,
-  secure_connection_start Float64,
-  connect_end Float64,
-  request_start Float64,
-  response_start Float64,
-  response_end Float64,
-  decoded_body_size Int64,
-  encoded_body_size Int64,
-  initiator_type LowCardinality(String),
-  next_hop_protocol LowCardinality(String),
-  render_blocking_status LowCardinality(String),
-  response_status Int64,
-  transfer_size Int64,
-  largest_contentful_paint_element String,
-  largest_contentful_paint_render_time Float64,
-  largest_contentful_paint_load_time Float64,
-  largest_contentful_paint_size Float64,
-  largest_contentful_paint_id String,
-  largest_contentful_paint_url String,
-  dom_complete Float64,
-  dom_content_loaded_event Float64,
-  dom_interactive Float64,
-  load_event_end Float64,
-  load_event_start Float64,
-  redirect_count Int64,
-  navigation_type LowCardinality(String),
-  unload_event_end Float64,
-  unload_event_start Float64
-      
-  ) ENGINE = Kafka('test.kafka.broker:9092', 'clickhouse_performance_events_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_kafka_table_with_different_kafka_host[kafka_person]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_person ON CLUSTER 'posthog'
-  (
-      id UUID,
-      created_at DateTime64,
-      team_id Int64,
-      properties VARCHAR,
-      is_identified Int8,
-      is_deleted Int8,
-      version UInt64
-      
-  ) ENGINE = Kafka('test.kafka.broker:9092', 'clickhouse_person_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_kafka_table_with_different_kafka_host[kafka_person_distinct_id2]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_person_distinct_id2 ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      distinct_id VARCHAR,
-      person_id UUID,
-      is_deleted Int8,
-      version Int64
-      
-  ) ENGINE = Kafka('test.kafka.broker:9092', 'clickhouse_person_distinct_id_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_kafka_table_with_different_kafka_host[kafka_person_distinct_id]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_person_distinct_id ON CLUSTER 'posthog'
-  (
-      distinct_id VARCHAR,
-      person_id UUID,
-      team_id Int64,
-      _sign Nullable(Int8),
-      is_deleted Nullable(Int8)
-  ) ENGINE = Kafka('test.kafka.broker:9092', 'clickhouse_person_unique_id_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_kafka_table_with_different_kafka_host[kafka_person_distinct_id_overrides]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_person_distinct_id_overrides ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      distinct_id VARCHAR,
-      person_id UUID,
-      is_deleted Int8,
-      version Int64
-      
-  ) ENGINE = Kafka('test.kafka.broker:9092', 'clickhouse_person_distinct_id_test', 'clickhouse-person-distinct-id-overrides', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_kafka_table_with_different_kafka_host[kafka_person_overrides]
-  '''
-  
-      CREATE TABLE IF NOT EXISTS `posthog_test`.`kafka_person_overrides`
-      ON CLUSTER 'posthog'
-  
-      ENGINE = Kafka(
-          'kafka:9092', -- Kafka hosts
-          'clickhouse_person_override_test', -- Kafka topic
-          'clickhouse-person-overrides', -- Kafka consumer group id
-          'JSONEachRow' -- Specify that we should pass Kafka messages as JSON
-      )
-  
-      -- Take the types from the `person_overrides` table, except for the
-      -- `created_at`, which we want to use the DEFAULT now() from the
-      -- `person_overrides` definition. See
-      -- https://github.com/ClickHouse/ClickHouse/pull/38272 for details of `EMPTY
-      -- AS SELECT`
-      EMPTY AS SELECT
-          team_id,
-          old_person_id,
-          override_person_id,
-          merged_at,
-          oldest_event,
-          -- We don't want to insert this column via Kafka, as it's
-          -- set as a default value in the `person_overrides` table.
-          -- created_at,
-          version
-      FROM `posthog_test`.`person_overrides`
-  
-  '''
-# ---
-# name: test_create_kafka_table_with_different_kafka_host[kafka_plugin_log_entries]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_plugin_log_entries ON CLUSTER 'posthog'
-  (
-      id UUID,
-      team_id Int64,
-      plugin_id Int64,
-      plugin_config_id Int64,
-      timestamp DateTime64(6, 'UTC'),
-      source VARCHAR,
-      type VARCHAR,
-      message VARCHAR,
-      instance_id UUID
-      
-  ) ENGINE = Kafka('test.kafka.broker:9092', 'plugin_log_entries_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_kafka_table_with_different_kafka_host[kafka_session_recording_events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_session_recording_events ON CLUSTER 'posthog'
-  (
-      uuid UUID,
-      timestamp DateTime64(6, 'UTC'),
-      team_id Int64,
-      distinct_id VARCHAR,
-      session_id VARCHAR,
-      window_id VARCHAR,
-      snapshot_data VARCHAR,
-      created_at DateTime64(6, 'UTC')
-      
-      
-  ) ENGINE = Kafka('test.kafka.broker:9092', 'clickhouse_session_recording_events_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_kafka_table_with_different_kafka_host[kafka_session_replay_events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_session_replay_events ON CLUSTER 'posthog'
-  (
-      session_id VARCHAR,
-      team_id Int64,
-      distinct_id VARCHAR,
-      first_timestamp DateTime64(6, 'UTC'),
-      last_timestamp DateTime64(6, 'UTC'),
-      first_url Nullable(VARCHAR),
-      click_count Int64,
-      keypress_count Int64,
-      mouse_activity_count Int64,
-      active_milliseconds Int64,
-      console_log_count Int64,
-      console_warn_count Int64,
-      console_error_count Int64,
-      size Int64,
-      event_count Int64,
-      message_count Int64,
-      snapshot_source LowCardinality(Nullable(String))
-  ) ENGINE = Kafka('test.kafka.broker:9092', 'clickhouse_session_replay_events_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_table_query[app_metrics2]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS app_metrics2 ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      timestamp DateTime64(6, 'UTC'),
-      -- The name of the service or product that generated the metrics.
-      -- Examples: plugins, hog
-      app_source LowCardinality(String),
-      -- An id for the app source.
-      -- Set app_source to avoid collision with ids from other app sources if the id generation is not safe.
-      -- Examples: A plugin id, a hog application id
-      app_source_id String,
-      -- A secondary id e.g. for the instance of app_source that generated this metric.
-      -- This may be ommitted if app_source is a singleton.
-      -- Examples: A plugin config id, a hog application config id
-      instance_id String,
-      metric_kind LowCardinality(String),
-      metric_name LowCardinality(String),
-      count SimpleAggregateFunction(sum, Int64)
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  , _partition UInt64
-  
-  )
-  ENGINE=Distributed('posthog', 'posthog_test', 'sharded_app_metrics2', rand())
-  
-  '''
-# ---
-# name: test_create_table_query[app_metrics2_mv]
-  '''
-  
-  CREATE MATERIALIZED VIEW IF NOT EXISTS app_metrics2_mv ON CLUSTER 'posthog'
-  TO posthog_test.sharded_app_metrics2
-  AS SELECT
-  team_id,
-  timestamp,
-  app_source,
-  app_source_id,
-  instance_id,
-  metric_kind,
-  metric_name,
-  count
-  FROM posthog_test.kafka_app_metrics2
-  
-  '''
-# ---
-# name: test_create_table_query[app_metrics]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS app_metrics ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      timestamp DateTime64(6, 'UTC'),
-      plugin_config_id Int64,
-      category LowCardinality(String),
-      job_id String,
-      successes SimpleAggregateFunction(sum, Int64),
-      successes_on_retry SimpleAggregateFunction(sum, Int64),
-      failures SimpleAggregateFunction(sum, Int64),
-      error_uuid UUID,
-      error_type String,
-      error_details String CODEC(ZSTD(3))
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  , _partition UInt64
-  
-  )
-  ENGINE=Distributed('posthog', 'posthog_test', 'sharded_app_metrics', rand())
-  
-  '''
-# ---
-# name: test_create_table_query[app_metrics_mv]
-  '''
-  
-  CREATE MATERIALIZED VIEW IF NOT EXISTS app_metrics_mv ON CLUSTER 'posthog'
-  TO posthog_test.sharded_app_metrics
-  AS SELECT
-  team_id,
-  timestamp,
-  plugin_config_id,
-  category,
-  job_id,
-  successes,
-  successes_on_retry,
-  failures,
-  error_uuid,
-  error_type,
-  error_details
-  FROM posthog_test.kafka_app_metrics
-  
-  '''
-# ---
-# name: test_create_table_query[channel_definition]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS channel_definition ON CLUSTER 'posthog' (
-      domain String NOT NULL,
-      kind String NOT NULL,
-      domain_type String NULL,
-      type_if_paid String NULL,
-      type_if_organic String NULL
-  ) ENGINE = ReplicatedMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.channel_definition', '{replica}-{shard}')
-  ORDER BY (domain, kind);
-  
-  '''
-# ---
-# name: test_create_table_query[cohortpeople]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS cohortpeople ON CLUSTER 'posthog'
-  (
-      person_id UUID,
-      cohort_id Int64,
-      team_id Int64,
-      sign Int8,
-      version UInt64
-  ) ENGINE = ReplicatedCollapsingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.cohortpeople', '{replica}-{shard}', sign)
-  Order By (team_id, cohort_id, person_id, version)
-  
-  
-  '''
-# ---
-# name: test_create_table_query[events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS events ON CLUSTER 'posthog'
-  (
-      uuid UUID,
-      event VARCHAR,
-      properties VARCHAR CODEC(ZSTD(3)),
-      timestamp DateTime64(6, 'UTC'),
-      team_id Int64,
-      distinct_id VARCHAR,
-      elements_chain VARCHAR,
-      created_at DateTime64(6, 'UTC'),
-      person_id UUID,
-      person_created_at DateTime64,
-      person_properties VARCHAR Codec(ZSTD(3)),
-      group0_properties VARCHAR Codec(ZSTD(3)),
-      group1_properties VARCHAR Codec(ZSTD(3)),
-      group2_properties VARCHAR Codec(ZSTD(3)),
-      group3_properties VARCHAR Codec(ZSTD(3)),
-      group4_properties VARCHAR Codec(ZSTD(3)),
-      group0_created_at DateTime64,
-      group1_created_at DateTime64,
-      group2_created_at DateTime64,
-      group3_created_at DateTime64,
-      group4_created_at DateTime64,
-      person_mode Enum8('full' = 0, 'propertyless' = 1, 'force_upgrade' = 2)
-      
-      , $group_0 VARCHAR COMMENT 'column_materializer::$group_0'
-      , $group_1 VARCHAR COMMENT 'column_materializer::$group_1'
-      , $group_2 VARCHAR COMMENT 'column_materializer::$group_2'
-      , $group_3 VARCHAR COMMENT 'column_materializer::$group_3'
-      , $group_4 VARCHAR COMMENT 'column_materializer::$group_4'
-      , $window_id VARCHAR COMMENT 'column_materializer::$window_id'
-      , $session_id VARCHAR COMMENT 'column_materializer::$session_id'
-      , elements_chain_href String COMMENT 'column_materializer::elements_chain::href'
-      , elements_chain_texts Array(String) COMMENT 'column_materializer::elements_chain::texts'
-      , elements_chain_ids Array(String) COMMENT 'column_materializer::elements_chain::ids'
-      , elements_chain_elements Array(Enum('a', 'button', 'form', 'input', 'select', 'textarea', 'label')) COMMENT 'column_materializer::elements_chain::elements'
-      , properties_group_custom Map(String, String), properties_group_feature_flags Map(String, String)
-  
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  , inserted_at Nullable(DateTime64(6, 'UTC')) DEFAULT NULL
-      
-  ) ENGINE = Distributed('posthog', 'posthog_test', 'sharded_events', sipHash64(distinct_id))
-  
-  '''
-# ---
-# name: test_create_table_query[events_dead_letter_queue]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS events_dead_letter_queue ON CLUSTER 'posthog'
-  (
-      id UUID,
-      event_uuid UUID,
-      event VARCHAR,
-      properties VARCHAR,
-      distinct_id VARCHAR,
-      team_id Int64,
-      elements_chain VARCHAR,
-      created_at DateTime64(6, 'UTC'),
-      ip VARCHAR,
-      site_url VARCHAR,
-      now DateTime64(6, 'UTC'),
-      raw_payload VARCHAR,
-      error_timestamp DateTime64(6, 'UTC'),
-      error_location VARCHAR,
-      error VARCHAR,
-      tags Array(VARCHAR)
-      
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  
-      , INDEX kafka_timestamp_minmax_events_dead_letter_queue _timestamp TYPE minmax GRANULARITY 3
-      
-  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.events_dead_letter_queue', '{replica}-{shard}', _timestamp)
-  ORDER BY (id, event_uuid, distinct_id, team_id)
-  
-  SETTINGS index_granularity=512
-  
-  '''
-# ---
-# name: test_create_table_query[events_dead_letter_queue_mv]
-  '''
-  
-  CREATE MATERIALIZED VIEW IF NOT EXISTS events_dead_letter_queue_mv ON CLUSTER 'posthog'
-  TO posthog_test.events_dead_letter_queue
-  AS SELECT
-  id,
-  event_uuid,
-  event,
-  properties,
-  distinct_id,
-  team_id,
-  elements_chain,
-  created_at,
-  ip,
-  site_url,
-  now,
-  raw_payload,
-  error_timestamp,
-  error_location,
-  error,
-  tags,
-  _timestamp,
-  _offset
-  FROM posthog_test.kafka_events_dead_letter_queue
-  
-  '''
-# ---
-# name: test_create_table_query[events_json_mv]
-  '''
-  
-  CREATE MATERIALIZED VIEW IF NOT EXISTS events_json_mv ON CLUSTER 'posthog'
-  TO posthog_test.writable_events
-  AS SELECT
-  uuid,
-  event,
-  properties,
-  timestamp,
-  team_id,
-  distinct_id,
-  elements_chain,
-  created_at,
-  person_id,
-  person_created_at,
-  person_properties,
-  group0_properties,
-  group1_properties,
-  group2_properties,
-  group3_properties,
-  group4_properties,
-  group0_created_at,
-  group1_created_at,
-  group2_created_at,
-  group3_created_at,
-  group4_created_at,
-  person_mode,
-  NOW64() AS inserted_at,
-  _timestamp,
-  _offset
-  FROM posthog_test.kafka_events_json
-  
-  '''
-# ---
-# name: test_create_table_query[groups]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS groups ON CLUSTER 'posthog'
-  (
-      group_type_index UInt8,
-      group_key VARCHAR,
-      created_at DateTime64,
-      team_id Int64,
-      group_properties VARCHAR
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  
-  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.groups', '{replica}-{shard}', _timestamp)
-  Order By (team_id, group_type_index, group_key)
-  
-  
-  '''
-# ---
-# name: test_create_table_query[groups_mv]
-  '''
-  
-  CREATE MATERIALIZED VIEW IF NOT EXISTS groups_mv ON CLUSTER 'posthog'
-  TO posthog_test.groups
-  AS SELECT
-  group_type_index,
-  group_key,
-  created_at,
-  team_id,
-  group_properties,
-  _timestamp,
-  _offset
-  FROM posthog_test.kafka_groups
-  
-  '''
-# ---
-# name: test_create_table_query[heatmaps]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS heatmaps ON CLUSTER 'posthog'
-  (
-      session_id VARCHAR,
-      team_id Int64,
-      distinct_id VARCHAR,
-      timestamp DateTime64(6, 'UTC'),
-      -- x is the x with resolution applied, the resolution converts high fidelity mouse positions into an NxN grid
-      x Int16,
-      -- y is the y with resolution applied, the resolution converts high fidelity mouse positions into an NxN grid
-      y Int16,
-      -- stored so that in future we can support other resolutions
-      scale_factor Int16,
-      viewport_width Int16,
-      viewport_height Int16,
-      -- some elements move when the page scrolls, others do not
-      pointer_target_fixed Bool,
-      current_url VARCHAR,
-      type LowCardinality(String),
-      _timestamp DateTime,
-      _offset UInt64,
-      _partition UInt64
-  ) ENGINE = Distributed('posthog', 'posthog_test', 'sharded_heatmaps', cityHash64(concat(toString(team_id), '-', session_id, '-', toString(toDate(timestamp)))))
-  
-  '''
-# ---
-# name: test_create_table_query[heatmaps_mv]
-  '''
-  
-  CREATE MATERIALIZED VIEW IF NOT EXISTS heatmaps_mv ON CLUSTER 'posthog'
-  TO posthog_test.writable_heatmaps
-  AS SELECT
-      session_id,
-      team_id,
-      distinct_id,
-      timestamp,
-      -- x is the x with resolution applied, the resolution converts high fidelity mouse positions into an NxN grid
-      x,
-      -- y is the y with resolution applied, the resolution converts high fidelity mouse positions into an NxN grid
-      y,
-      -- stored so that in future we can support other resolutions
-      scale_factor,
-      viewport_width,
-      viewport_height,
-      -- some elements move when the page scrolls, others do not
-      pointer_target_fixed,
-      current_url,
-      type,
-      _timestamp,
-      _offset,
-      _partition
-  FROM posthog_test.kafka_heatmaps
-  
-  '''
-# ---
-# name: test_create_table_query[ingestion_warnings]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS ingestion_warnings ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      source LowCardinality(VARCHAR),
-      type VARCHAR,
-      details VARCHAR CODEC(ZSTD(3)),
-      timestamp DateTime64(6, 'UTC')
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  , _partition UInt64
-  
-  ) ENGINE = Distributed('posthog', 'posthog_test', 'sharded_ingestion_warnings', rand())
-  
-  '''
-# ---
-# name: test_create_table_query[ingestion_warnings_mv]
-  '''
-  
-  CREATE MATERIALIZED VIEW IF NOT EXISTS ingestion_warnings_mv ON CLUSTER 'posthog'
-  TO posthog_test.ingestion_warnings
-  AS SELECT
-  team_id,
-  source,
-  type,
-  details,
-  timestamp,
-  _timestamp,
-  _offset,
-  _partition
-  FROM posthog_test.kafka_ingestion_warnings
-  
-  '''
-# ---
-# name: test_create_table_query[kafka_app_metrics2]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_app_metrics2 ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      timestamp DateTime64(6, 'UTC'),
-      app_source LowCardinality(String),
-      app_source_id String,
-      instance_id String,
-      metric_kind String,
-      metric_name String,
-      count Int64
-  )
-  ENGINE=Kafka('kafka:9092', 'clickhouse_app_metrics2_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_table_query[kafka_app_metrics]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_app_metrics ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      timestamp DateTime64(6, 'UTC'),
-      plugin_config_id Int64,
-      category LowCardinality(String),
-      job_id String,
-      successes Int64,
-      successes_on_retry Int64,
-      failures Int64,
-      error_uuid UUID,
-      error_type String,
-      error_details String CODEC(ZSTD(3))
-  )
-  ENGINE=Kafka('kafka:9092', 'clickhouse_app_metrics_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_table_query[kafka_events_dead_letter_queue]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_events_dead_letter_queue ON CLUSTER 'posthog'
-  (
-      id UUID,
-      event_uuid UUID,
-      event VARCHAR,
-      properties VARCHAR,
-      distinct_id VARCHAR,
-      team_id Int64,
-      elements_chain VARCHAR,
-      created_at DateTime64(6, 'UTC'),
-      ip VARCHAR,
-      site_url VARCHAR,
-      now DateTime64(6, 'UTC'),
-      raw_payload VARCHAR,
-      error_timestamp DateTime64(6, 'UTC'),
-      error_location VARCHAR,
-      error VARCHAR,
-      tags Array(VARCHAR)
-      
-  ) ENGINE = Kafka('kafka:9092', 'events_dead_letter_queue_test', 'group1', 'JSONEachRow')
-   SETTINGS kafka_skip_broken_messages=1000
-  '''
-# ---
-# name: test_create_table_query[kafka_events_json]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_events_json ON CLUSTER 'posthog'
-  (
-      uuid UUID,
-      event VARCHAR,
-      properties VARCHAR CODEC(ZSTD(3)),
-      timestamp DateTime64(6, 'UTC'),
-      team_id Int64,
-      distinct_id VARCHAR,
-      elements_chain VARCHAR,
-      created_at DateTime64(6, 'UTC'),
-      person_id UUID,
-      person_created_at DateTime64,
-      person_properties VARCHAR Codec(ZSTD(3)),
-      group0_properties VARCHAR Codec(ZSTD(3)),
-      group1_properties VARCHAR Codec(ZSTD(3)),
-      group2_properties VARCHAR Codec(ZSTD(3)),
-      group3_properties VARCHAR Codec(ZSTD(3)),
-      group4_properties VARCHAR Codec(ZSTD(3)),
-      group0_created_at DateTime64,
-      group1_created_at DateTime64,
-      group2_created_at DateTime64,
-      group3_created_at DateTime64,
-      group4_created_at DateTime64,
-      person_mode Enum8('full' = 0, 'propertyless' = 1, 'force_upgrade' = 2)
-      
-      
-      
-  ) ENGINE = Kafka('kafka:9092', 'clickhouse_events_json_test', 'group1', 'JSONEachRow')
-  
-      SETTINGS kafka_skip_broken_messages = 100
-  
-  '''
-# ---
-# name: test_create_table_query[kafka_groups]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_groups ON CLUSTER 'posthog'
-  (
-      group_type_index UInt8,
-      group_key VARCHAR,
-      created_at DateTime64,
-      team_id Int64,
-      group_properties VARCHAR
-      
-  ) ENGINE = Kafka('kafka:9092', 'clickhouse_groups_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_table_query[kafka_heatmaps]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_heatmaps ON CLUSTER 'posthog'
-  (
-      session_id VARCHAR,
-      team_id Int64,
-      distinct_id VARCHAR,
-      timestamp DateTime64(6, 'UTC'),
-      -- x is the x with resolution applied, the resolution converts high fidelity mouse positions into an NxN grid
-      x Int16,
-      -- y is the y with resolution applied, the resolution converts high fidelity mouse positions into an NxN grid
-      y Int16,
-      -- stored so that in future we can support other resolutions
-      scale_factor Int16,
-      viewport_width Int16,
-      viewport_height Int16,
-      -- some elements move when the page scrolls, others do not
-      pointer_target_fixed Bool,
-      current_url VARCHAR,
-      type LowCardinality(String)
-  ) ENGINE = Kafka('kafka:9092', 'clickhouse_heatmap_events_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_table_query[kafka_ingestion_warnings]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_ingestion_warnings ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      source LowCardinality(VARCHAR),
-      type VARCHAR,
-      details VARCHAR CODEC(ZSTD(3)),
-      timestamp DateTime64(6, 'UTC')
-      
-  ) ENGINE = Kafka('kafka:9092', 'clickhouse_ingestion_warnings_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_table_query[kafka_log_entries]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_log_entries ON CLUSTER 'posthog'
-  (
-      team_id UInt64,
-      -- The name of the service or product that generated the logs.
-      -- Examples: batch_exports
-      log_source LowCardinality(String),
-      -- An id for the log source.
-      -- Set log_source to avoid collision with ids from other log sources if the id generation is not safe.
-      -- Examples: A batch export id, a cronjob id, a plugin id.
-      log_source_id String,
-      -- A secondary id e.g. for the instance of log_source that generated this log.
-      -- This may be ommitted if log_source is a singleton.
-      -- Examples: A batch export run id, a plugin_config id, a thread id, a process id, a machine id.
-      instance_id String,
-      -- Timestamp indicating when the log was generated.
-      timestamp DateTime64(6, 'UTC'),
-      -- The log level.
-      -- Examples: INFO, WARNING, DEBUG, ERROR.
-      level LowCardinality(String),
-      -- The actual log message.
-      message String
-      
-  ) ENGINE = Kafka('kafka:9092', 'log_entries_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_table_query[kafka_performance_events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_performance_events ON CLUSTER 'posthog'
-  (
-      uuid UUID,
-  session_id String,
-  window_id String,
-  pageview_id String,
-  distinct_id String,
-  timestamp DateTime64,
-  time_origin DateTime64(3, 'UTC'),
-  entry_type LowCardinality(String),
-  name String,
-  team_id Int64,
-  current_url String,
-  start_time Float64,
-  duration Float64,
-  redirect_start Float64,
-  redirect_end Float64,
-  worker_start Float64,
-  fetch_start Float64,
-  domain_lookup_start Float64,
-  domain_lookup_end Float64,
-  connect_start Float64,
-  secure_connection_start Float64,
-  connect_end Float64,
-  request_start Float64,
-  response_start Float64,
-  response_end Float64,
-  decoded_body_size Int64,
-  encoded_body_size Int64,
-  initiator_type LowCardinality(String),
-  next_hop_protocol LowCardinality(String),
-  render_blocking_status LowCardinality(String),
-  response_status Int64,
-  transfer_size Int64,
-  largest_contentful_paint_element String,
-  largest_contentful_paint_render_time Float64,
-  largest_contentful_paint_load_time Float64,
-  largest_contentful_paint_size Float64,
-  largest_contentful_paint_id String,
-  largest_contentful_paint_url String,
-  dom_complete Float64,
-  dom_content_loaded_event Float64,
-  dom_interactive Float64,
-  load_event_end Float64,
-  load_event_start Float64,
-  redirect_count Int64,
-  navigation_type LowCardinality(String),
-  unload_event_end Float64,
-  unload_event_start Float64
-      
-  ) ENGINE = Kafka('kafka:9092', 'clickhouse_performance_events_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_table_query[kafka_person]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_person ON CLUSTER 'posthog'
-  (
-      id UUID,
-      created_at DateTime64,
-      team_id Int64,
-      properties VARCHAR,
-      is_identified Int8,
-      is_deleted Int8,
-      version UInt64
-      
-  ) ENGINE = Kafka('kafka:9092', 'clickhouse_person_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_table_query[kafka_person_distinct_id2]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_person_distinct_id2 ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      distinct_id VARCHAR,
-      person_id UUID,
-      is_deleted Int8,
-      version Int64
-      
-  ) ENGINE = Kafka('kafka:9092', 'clickhouse_person_distinct_id_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_table_query[kafka_person_distinct_id]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_person_distinct_id ON CLUSTER 'posthog'
-  (
-      distinct_id VARCHAR,
-      person_id UUID,
-      team_id Int64,
-      _sign Nullable(Int8),
-      is_deleted Nullable(Int8)
-  ) ENGINE = Kafka('kafka:9092', 'clickhouse_person_unique_id_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_table_query[kafka_person_distinct_id_overrides]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_person_distinct_id_overrides ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      distinct_id VARCHAR,
-      person_id UUID,
-      is_deleted Int8,
-      version Int64
-      
-  ) ENGINE = Kafka('kafka:9092', 'clickhouse_person_distinct_id_test', 'clickhouse-person-distinct-id-overrides', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_table_query[kafka_person_overrides]
-  '''
-  
-      CREATE TABLE IF NOT EXISTS `posthog_test`.`kafka_person_overrides`
-      ON CLUSTER 'posthog'
-  
-      ENGINE = Kafka(
-          'kafka:9092', -- Kafka hosts
-          'clickhouse_person_override_test', -- Kafka topic
-          'clickhouse-person-overrides', -- Kafka consumer group id
-          'JSONEachRow' -- Specify that we should pass Kafka messages as JSON
-      )
-  
-      -- Take the types from the `person_overrides` table, except for the
-      -- `created_at`, which we want to use the DEFAULT now() from the
-      -- `person_overrides` definition. See
-      -- https://github.com/ClickHouse/ClickHouse/pull/38272 for details of `EMPTY
-      -- AS SELECT`
-      EMPTY AS SELECT
-          team_id,
-          old_person_id,
-          override_person_id,
-          merged_at,
-          oldest_event,
-          -- We don't want to insert this column via Kafka, as it's
-          -- set as a default value in the `person_overrides` table.
-          -- created_at,
-          version
-      FROM `posthog_test`.`person_overrides`
-  
-  '''
-# ---
-# name: test_create_table_query[kafka_plugin_log_entries]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_plugin_log_entries ON CLUSTER 'posthog'
-  (
-      id UUID,
-      team_id Int64,
-      plugin_id Int64,
-      plugin_config_id Int64,
-      timestamp DateTime64(6, 'UTC'),
-      source VARCHAR,
-      type VARCHAR,
-      message VARCHAR,
-      instance_id UUID
-      
-  ) ENGINE = Kafka('kafka:9092', 'plugin_log_entries_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_table_query[kafka_session_recording_events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_session_recording_events ON CLUSTER 'posthog'
-  (
-      uuid UUID,
-      timestamp DateTime64(6, 'UTC'),
-      team_id Int64,
-      distinct_id VARCHAR,
-      session_id VARCHAR,
-      window_id VARCHAR,
-      snapshot_data VARCHAR,
-      created_at DateTime64(6, 'UTC')
-      
-      
-  ) ENGINE = Kafka('kafka:9092', 'clickhouse_session_recording_events_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_table_query[kafka_session_replay_events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS kafka_session_replay_events ON CLUSTER 'posthog'
-  (
-      session_id VARCHAR,
-      team_id Int64,
-      distinct_id VARCHAR,
-      first_timestamp DateTime64(6, 'UTC'),
-      last_timestamp DateTime64(6, 'UTC'),
-      first_url Nullable(VARCHAR),
-      click_count Int64,
-      keypress_count Int64,
-      mouse_activity_count Int64,
-      active_milliseconds Int64,
-      console_log_count Int64,
-      console_warn_count Int64,
-      console_error_count Int64,
-      size Int64,
-      event_count Int64,
-      message_count Int64,
-      snapshot_source LowCardinality(Nullable(String))
-  ) ENGINE = Kafka('kafka:9092', 'clickhouse_session_replay_events_test', 'group1', 'JSONEachRow')
-  
-  '''
-# ---
-# name: test_create_table_query[log_entries]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS log_entries ON CLUSTER 'posthog'
-  (
-      team_id UInt64,
-      -- The name of the service or product that generated the logs.
-      -- Examples: batch_exports
-      log_source LowCardinality(String),
-      -- An id for the log source.
-      -- Set log_source to avoid collision with ids from other log sources if the id generation is not safe.
-      -- Examples: A batch export id, a cronjob id, a plugin id.
-      log_source_id String,
-      -- A secondary id e.g. for the instance of log_source that generated this log.
-      -- This may be ommitted if log_source is a singleton.
-      -- Examples: A batch export run id, a plugin_config id, a thread id, a process id, a machine id.
-      instance_id String,
-      -- Timestamp indicating when the log was generated.
-      timestamp DateTime64(6, 'UTC'),
-      -- The log level.
-      -- Examples: INFO, WARNING, DEBUG, ERROR.
-      level LowCardinality(String),
-      -- The actual log message.
-      message String
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  
-  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.log_entries', '{replica}-{shard}', _timestamp)
-  PARTITION BY toStartOfHour(timestamp) ORDER BY (team_id, log_source, log_source_id, instance_id, timestamp)
-  
-  SETTINGS index_granularity=512
-  
-  '''
-# ---
-# name: test_create_table_query[log_entries_mv]
-  '''
-  
-  CREATE MATERIALIZED VIEW IF NOT EXISTS log_entries_mv ON CLUSTER 'posthog'
-  TO posthog_test.log_entries
-  AS SELECT
-  team_id,
-  log_source,
-  log_source_id,
-  instance_id,
-  timestamp,
-  level,
-  message,
-  _timestamp,
-  _offset
-  FROM posthog_test.kafka_log_entries
-  
-  '''
-# ---
-# name: test_create_table_query[performance_events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS performance_events ON CLUSTER 'posthog'
-  (
-      uuid UUID,
-  session_id String,
-  window_id String,
-  pageview_id String,
-  distinct_id String,
-  timestamp DateTime64,
-  time_origin DateTime64(3, 'UTC'),
-  entry_type LowCardinality(String),
-  name String,
-  team_id Int64,
-  current_url String,
-  start_time Float64,
-  duration Float64,
-  redirect_start Float64,
-  redirect_end Float64,
-  worker_start Float64,
-  fetch_start Float64,
-  domain_lookup_start Float64,
-  domain_lookup_end Float64,
-  connect_start Float64,
-  secure_connection_start Float64,
-  connect_end Float64,
-  request_start Float64,
-  response_start Float64,
-  response_end Float64,
-  decoded_body_size Int64,
-  encoded_body_size Int64,
-  initiator_type LowCardinality(String),
-  next_hop_protocol LowCardinality(String),
-  render_blocking_status LowCardinality(String),
-  response_status Int64,
-  transfer_size Int64,
-  largest_contentful_paint_element String,
-  largest_contentful_paint_render_time Float64,
-  largest_contentful_paint_load_time Float64,
-  largest_contentful_paint_size Float64,
-  largest_contentful_paint_id String,
-  largest_contentful_paint_url String,
-  dom_complete Float64,
-  dom_content_loaded_event Float64,
-  dom_interactive Float64,
-  load_event_end Float64,
-  load_event_start Float64,
-  redirect_count Int64,
-  navigation_type LowCardinality(String),
-  unload_event_end Float64,
-  unload_event_start Float64
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  , _partition UInt64
-  
-  ) ENGINE = Distributed('posthog', 'posthog_test', 'sharded_performance_events', sipHash64(session_id))
-  
-  '''
-# ---
-# name: test_create_table_query[performance_events_mv]
-  '''
-  
-  CREATE MATERIALIZED VIEW IF NOT EXISTS performance_events_mv ON CLUSTER 'posthog'
-  TO posthog_test.writeable_performance_events
-  AS SELECT
-  uuid, session_id, window_id, pageview_id, distinct_id, timestamp, time_origin, entry_type, name, team_id, current_url, start_time, duration, redirect_start, redirect_end, worker_start, fetch_start, domain_lookup_start, domain_lookup_end, connect_start, secure_connection_start, connect_end, request_start, response_start, response_end, decoded_body_size, encoded_body_size, initiator_type, next_hop_protocol, render_blocking_status, response_status, transfer_size, largest_contentful_paint_element, largest_contentful_paint_render_time, largest_contentful_paint_load_time, largest_contentful_paint_size, largest_contentful_paint_id, largest_contentful_paint_url, dom_complete, dom_content_loaded_event, dom_interactive, load_event_end, load_event_start, redirect_count, navigation_type, unload_event_end, unload_event_start
-  ,_timestamp, _offset, _partition
-  FROM posthog_test.kafka_performance_events
-  
-  '''
-# ---
-# name: test_create_table_query[person]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS person ON CLUSTER 'posthog'
-  (
-      id UUID,
-      created_at DateTime64,
-      team_id Int64,
-      properties VARCHAR,
-      is_identified Int8,
-      is_deleted Int8,
-      version UInt64
-      
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  
-      , INDEX kafka_timestamp_minmax_person _timestamp TYPE minmax GRANULARITY 3
-      
-  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.person', '{replica}-{shard}', version)
-  Order By (team_id, id)
-  
-  
-  '''
-# ---
-# name: test_create_table_query[person_distinct_id2]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS person_distinct_id2 ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      distinct_id VARCHAR,
-      person_id UUID,
-      is_deleted Int8,
-      version Int64
-      
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  
-      , _partition UInt64
-      , INDEX kafka_timestamp_minmax_person_distinct_id2 _timestamp TYPE minmax GRANULARITY 3
-      
-  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.person_distinct_id2', '{replica}-{shard}', version)
-  
-      ORDER BY (team_id, distinct_id)
-      SETTINGS index_granularity = 512
-      
-  '''
-# ---
-# name: test_create_table_query[person_distinct_id2_mv]
-  '''
-  
-  CREATE MATERIALIZED VIEW IF NOT EXISTS person_distinct_id2_mv ON CLUSTER 'posthog'
-  TO posthog_test.person_distinct_id2
-  AS SELECT
-  team_id,
-  distinct_id,
-  person_id,
-  is_deleted,
-  version,
-  _timestamp,
-  _offset,
-  _partition
-  FROM posthog_test.kafka_person_distinct_id2
-  
-  '''
-# ---
-# name: test_create_table_query[person_distinct_id]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS person_distinct_id ON CLUSTER 'posthog'
-  (
-      distinct_id VARCHAR,
-      person_id UUID,
-      team_id Int64,
-      _sign Int8 DEFAULT 1,
-      is_deleted Int8 ALIAS if(_sign==-1, 1, 0)
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  
-  ) ENGINE = ReplicatedCollapsingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.person_distinct_id', '{replica}-{shard}', _sign)
-  Order By (team_id, distinct_id, person_id)
-  
-  
-  '''
-# ---
-# name: test_create_table_query[person_distinct_id_mv]
-  '''
-  
-  CREATE MATERIALIZED VIEW IF NOT EXISTS person_distinct_id_mv ON CLUSTER 'posthog'
-  TO posthog_test.person_distinct_id
-  AS SELECT
-  distinct_id,
-  person_id,
-  team_id,
-  coalesce(_sign, if(is_deleted==0, 1, -1)) AS _sign,
-  _timestamp,
-  _offset
-  FROM posthog_test.kafka_person_distinct_id
-  
-  '''
-# ---
-# name: test_create_table_query[person_distinct_id_overrides]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS person_distinct_id_overrides ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      distinct_id VARCHAR,
-      person_id UUID,
-      is_deleted Int8,
-      version Int64
-      
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  , _partition UInt64
-  
-      , INDEX kafka_timestamp_minmax_person_distinct_id_overrides _timestamp TYPE minmax GRANULARITY 3
-      
-  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.person_distinct_id_overrides', '{replica}-{shard}', version)
-  
-      ORDER BY (team_id, distinct_id)
-      SETTINGS index_granularity = 512
-      
-  '''
-# ---
-# name: test_create_table_query[person_distinct_id_overrides_mv]
-  '''
-  
-  CREATE MATERIALIZED VIEW IF NOT EXISTS person_distinct_id_overrides_mv ON CLUSTER 'posthog'
-  TO posthog_test.person_distinct_id_overrides
-  AS SELECT
-  team_id,
-  distinct_id,
-  person_id,
-  is_deleted,
-  version,
-  _timestamp,
-  _offset,
-  _partition
-  FROM posthog_test.kafka_person_distinct_id_overrides
-  WHERE version > 0 -- only store updated rows, not newly inserted ones
-  
-  '''
-# ---
-# name: test_create_table_query[person_mv]
-  '''
-  
-  CREATE MATERIALIZED VIEW IF NOT EXISTS person_mv ON CLUSTER 'posthog'
-  TO posthog_test.person
-  AS SELECT
-  id,
-  created_at,
-  team_id,
-  properties,
-  is_identified,
-  is_deleted,
-  version,
-  _timestamp,
-  _offset
-  FROM posthog_test.kafka_person
-  
-  '''
-# ---
-# name: test_create_table_query[person_overrides]
-  '''
-  
-      CREATE TABLE IF NOT EXISTS `posthog_test`.`person_overrides`
-      ON CLUSTER 'posthog' (
-          team_id INT NOT NULL,
-  
-          -- When we merge two people `old_person_id` and `override_person_id`, we
-          -- want to keep track of a mapping from the `old_person_id` to the
-          -- `override_person_id`. This allows us to join with the
-          -- `sharded_events` table to find all events that were associated with
-          -- the `old_person_id` and update them to be associated with the
-          -- `override_person_id`.
-          old_person_id UUID NOT NULL,
-          override_person_id UUID NOT NULL,
-  
-          -- The timestamp the merge of the two people was completed.
-          merged_at DateTime64(6, 'UTC') NOT NULL,
-          -- The timestamp of the oldest event associated with the
-          -- `old_person_id`.
-          oldest_event DateTime64(6, 'UTC') NOT NULL,
-          -- The timestamp rows are created. This isn't part of the JOIN process
-          -- with the events table but rather a housekeeping column to allow us to
-          -- see when the row was created. This shouldn't have any impact of the
-          -- JOIN as it will be stored separately with the Wide ClickHouse table
-          -- storage.
-          created_at DateTime64(6, 'UTC') DEFAULT now(),
-  
-          -- the specific version of the `old_person_id` mapping. This is used to
-          -- allow us to discard old mappings as new ones are added. This version
-          -- will be provided by the corresponding PostgreSQL
-          --`posthog_personoverrides` table
-          version INT NOT NULL
-      )
-  
-      -- By specifying Replacing merge tree on version, we allow ClickHouse to
-      -- discard old versions of a `old_person_id` mapping. This should help keep
-      -- performance in check as new versions are added. Note that given we can
-      -- have partitioning by `oldest_event` which will change as we update
-      -- `person_id` on old partitions.
-      --
-      -- We also need to ensure that the data is replicated to all replicas in the
-      -- cluster, as we do not have any constraints on person_id and which shard
-      -- associated events are on. To do this we use the ReplicatedReplacingMergeTree
-      -- engine specifying a static `zk_path`. This will cause the Engine to
-      -- consider all replicas as the same. See
-      -- https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/replication
-      -- for details.
-      ENGINE = ReplicatedReplacingMergeTree(
-          -- NOTE: for testing we use a uuid to ensure that we don't get conflicts
-          -- when the tests tear down and recreate the table.
-          '/clickhouse/tables/{uuid}noshard/posthog_test.person_overrides',
-          '{replica}-{shard}',
-          version
-      )
-  
-      -- We partition the table by the `oldest_event` column. This allows us to
-      -- handle updating the events table partition by partition, progressing each
-      -- override partition by partition in lockstep with the events table. Note
-      -- that this means it is possible that we have a mapping from
-      -- `old_person_id` in multiple partitions during the merge process.
-      PARTITION BY toYYYYMM(oldest_event)
-  
-      -- We want to collapse down on the `old_person_id` such that we end up with
-      -- the newest known mapping for it in the table. Query side we will need to
-      -- ensure that we are always querying the latest version of the mapping.
-      ORDER BY (team_id, old_person_id)
-  
-  '''
-# ---
-# name: test_create_table_query[person_overrides_mv]
-  '''
-  
-      CREATE MATERIALIZED VIEW IF NOT EXISTS `posthog_test`.`person_overrides_mv`
-      ON CLUSTER 'posthog'
-      TO `posthog_test`.`person_overrides`
-      AS SELECT
-          team_id,
-          old_person_id,
-          override_person_id,
-          merged_at,
-          oldest_event,
-          -- We don't want to insert this column via Kafka, as it's
-          -- set as a default value in the `person_overrides` table.
-          -- created_at,
-          version
-      FROM `posthog_test`.`kafka_person_overrides`
-  
-  '''
-# ---
-# name: test_create_table_query[person_static_cohort]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS person_static_cohort ON CLUSTER 'posthog'
-  (
-      id UUID,
-      person_id UUID,
-      cohort_id Int64,
-      team_id Int64
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  
-  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.person_static_cohort', '{replica}-{shard}', _timestamp)
-  Order By (team_id, cohort_id, person_id, id)
-  
-  
-  '''
-# ---
-# name: test_create_table_query[plugin_log_entries]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS plugin_log_entries ON CLUSTER 'posthog'
-  (
-      id UUID,
-      team_id Int64,
-      plugin_id Int64,
-      plugin_config_id Int64,
-      timestamp DateTime64(6, 'UTC'),
-      source VARCHAR,
-      type VARCHAR,
-      message VARCHAR,
-      instance_id UUID
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  
-  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.plugin_log_entries', '{replica}-{shard}', _timestamp)
-  PARTITION BY toYYYYMMDD(timestamp) ORDER BY (team_id, plugin_id, plugin_config_id, timestamp)
-  
-  SETTINGS index_granularity=512
-  
-  '''
-# ---
-# name: test_create_table_query[plugin_log_entries_mv]
-  '''
-  
-  CREATE MATERIALIZED VIEW IF NOT EXISTS plugin_log_entries_mv ON CLUSTER 'posthog'
-  TO posthog_test.plugin_log_entries
-  AS SELECT
-  id,
-  team_id,
-  plugin_id,
-  plugin_config_id,
-  timestamp,
-  source,
-  type,
-  message,
-  instance_id,
-  _timestamp,
-  _offset
-  FROM posthog_test.kafka_plugin_log_entries
-  
-  '''
-# ---
-# name: test_create_table_query[raw_sessions]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS raw_sessions ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      session_id_v7 UInt128, -- integer representation of a uuidv7
-  
-      -- ClickHouse will pick the latest value of distinct_id for the session
-      -- this is fine since even if the distinct_id changes during a session
-      distinct_id AggregateFunction(argMax, String, DateTime64(6, 'UTC')),
-  
-      min_timestamp SimpleAggregateFunction(min, DateTime64(6, 'UTC')),
-      max_timestamp SimpleAggregateFunction(max, DateTime64(6, 'UTC')),
-  
-      -- urls
-      urls SimpleAggregateFunction(groupUniqArrayArray, Array(String)),
-      entry_url AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      end_url AggregateFunction(argMax, String, DateTime64(6, 'UTC')),
-      last_external_click_url AggregateFunction(argMax, String, DateTime64(6, 'UTC')),
-  
-      -- device
-      initial_browser AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_browser_version AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_os AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_os_version AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_device_type AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_viewport_width AggregateFunction(argMin, Int64, DateTime64(6, 'UTC')),
-      initial_viewport_height AggregateFunction(argMin, Int64, DateTime64(6, 'UTC')),
-  
-      -- geoip
-      -- only store the properties we actually use, as there's tons, see https://posthog.com/docs/cdp/geoip-enrichment
-      initial_geoip_country_code AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_geoip_subdivision_1_code AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_geoip_subdivision_1_name AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_geoip_subdivision_city_name AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_geoip_time_zone AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-  
-      -- attribution
-      initial_referring_domain AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_source AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_campaign AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_medium AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_term AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_content AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gad_source AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gclsrc AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_dclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gbraid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_wbraid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_fbclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_msclkid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_twclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_li_fat_id AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_mc_cid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_igshid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_ttclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-  
-      -- Count pageview, autocapture, and screen events for providing totals.
-      -- It's unclear if we can use the counts as they are not idempotent, and we had a bug on EU where events were
-      -- double-counted, so the counts were wrong. To get around this, also keep track of the unique uuids. This will be
-      -- slower and more expensive to store, but will be correct even if events are double-counted, so can be used to
-      -- verify correctness and as a backup. Ideally we will be able to delete the uniq columns in the future when we're
-      -- satisfied that counts are accurate.
-      pageview_count SimpleAggregateFunction(sum, Int64),
-      pageview_uniq AggregateFunction(uniq, Nullable(UUID)),
-      autocapture_count SimpleAggregateFunction(sum, Int64),
-      autocapture_uniq AggregateFunction(uniq, Nullable(UUID)),
-      screen_count SimpleAggregateFunction(sum, Int64),
-      screen_uniq AggregateFunction(uniq, Nullable(UUID)),
-  
-      -- replay
-      maybe_has_session_replay SimpleAggregateFunction(max, Bool), -- will be written False to by the events table mv and True to by the replay table mv
-  
-      -- as a performance optimisation, also keep track of the uniq events for all of these combined, a bounce is a session with <2 of these
-      page_screen_autocapture_uniq_up_to AggregateFunction(uniqUpTo(1), Nullable(UUID)),
-  
-      -- web vitals
-      vitals_lcp AggregateFunction(argMin, Nullable(Float64), DateTime64(6, 'UTC'))
-  ) ENGINE = Distributed('posthog', 'posthog_test', 'sharded_raw_sessions', cityHash64(session_id_v7))
-  
-  '''
-# ---
-# name: test_create_table_query[raw_sessions_mv]
-  '''
-  
-  CREATE MATERIALIZED VIEW IF NOT EXISTS raw_sessions_mv ON CLUSTER 'posthog'
-  TO posthog_test.writable_raw_sessions
-  AS
-  
-  SELECT
-      team_id,
-      toUInt128(toUUID(`$session_id`)) as session_id_v7,
-  
-      argMaxState(distinct_id, timestamp) as distinct_id,
-  
-      min(timestamp) AS min_timestamp,
-      max(timestamp) AS max_timestamp,
-  
-      -- urls
-      groupUniqArray(nullIf(JSONExtractString(properties, '$current_url'), '')) AS urls,
-      argMinState(JSONExtractString(properties, '$current_url'), timestamp) as entry_url,
-      argMaxState(JSONExtractString(properties, '$current_url'), timestamp) as end_url,
-      argMaxState(JSONExtractString(properties, '$external_click_url'), timestamp) as last_external_click_url,
-  
-      -- device
-      argMinState(JSONExtractString(properties, '$browser'), timestamp) as initial_browser,
-      argMinState(JSONExtractString(properties, '$browser_version'), timestamp) as initial_browser_version,
-      argMinState(JSONExtractString(properties, '$os'), timestamp) as initial_os,
-      argMinState(JSONExtractString(properties, '$os_version'), timestamp) as initial_os_version,
-      argMinState(JSONExtractString(properties, '$device_type'), timestamp) as initial_device_type,
-      argMinState(JSONExtractInt(properties, '$viewport_width'), timestamp) as initial_viewport_width,
-      argMinState(JSONExtractInt(properties, '$viewport_height'), timestamp) as initial_viewport_height,
-  
-      -- geoip
-      argMinState(JSONExtractString(properties, '$geoip_country_code'), timestamp) as initial_geoip_country_code,
-      argMinState(JSONExtractString(properties, '$geoip_subdivision_1_code'), timestamp) as initial_geoip_subdivision_1_code,
-      argMinState(JSONExtractString(properties, '$geoip_subdivision_1_name'), timestamp) as initial_geoip_subdivision_1_name,
-      argMinState(JSONExtractString(properties, '$geoip_subdivision_city_name'), timestamp) as initial_geoip_subdivision_city_name,
-      argMinState(JSONExtractString(properties, '$geoip_time_zone'), timestamp) as initial_geoip_time_zone,
-  
-      -- attribution
-      argMinState(JSONExtractString(properties, '$referring_domain'), timestamp) as initial_referring_domain,
-      argMinState(JSONExtractString(properties, 'utm_source'), timestamp) as initial_utm_source,
-      argMinState(JSONExtractString(properties, 'utm_campaign'), timestamp) as initial_utm_campaign,
-      argMinState(JSONExtractString(properties, 'utm_medium'), timestamp) as initial_utm_medium,
-      argMinState(JSONExtractString(properties, 'utm_term'), timestamp) as initial_utm_term,
-      argMinState(JSONExtractString(properties, 'utm_content'), timestamp) as initial_utm_content,
-      argMinState(JSONExtractString(properties, 'gclid'), timestamp) as initial_gclid,
-      argMinState(JSONExtractString(properties, 'gad_source'), timestamp) as initial_gad_source,
-      argMinState(JSONExtractString(properties, 'gclsrc'), timestamp) as initial_gclsrc,
-      argMinState(JSONExtractString(properties, 'dclid'), timestamp) as initial_dclid,
-      argMinState(JSONExtractString(properties, 'gbraid'), timestamp) as initial_gbraid,
-      argMinState(JSONExtractString(properties, 'wbraid'), timestamp) as initial_wbraid,
-      argMinState(JSONExtractString(properties, 'fbclid'), timestamp) as initial_fbclid,
-      argMinState(JSONExtractString(properties, 'msclkid'), timestamp) as initial_msclkid,
-      argMinState(JSONExtractString(properties, 'twclid'), timestamp) as initial_twclid,
-      argMinState(JSONExtractString(properties, 'li_fat_id'), timestamp) as initial_li_fat_id,
-      argMinState(JSONExtractString(properties, 'mc_cid'), timestamp) as initial_mc_cid,
-      argMinState(JSONExtractString(properties, 'igshid'), timestamp) as initial_igshid,
-      argMinState(JSONExtractString(properties, 'ttclid'), timestamp) as initial_ttclid,
-  
-      -- count
-      sumIf(1, event='$pageview') as pageview_count,
-      uniqState(CAST(if(event='$pageview', uuid, NULL) AS Nullable(UUID))) as pageview_uniq,
-      sumIf(1, event='$autocapture') as autocapture_count,
-      uniqState(CAST(if(event='$autocapture', uuid, NULL) AS Nullable(UUID))) as autocapture_uniq,
-      sumIf(1, event='$screen') as screen_count,
-      uniqState(CAST(if(event='$screen', uuid, NULL) AS Nullable(UUID))) as screen_uniq,
-  
-      -- replay
-      false as maybe_has_session_replay,
-  
-      -- perf
-      uniqUpToState(1)(CAST(if(event='$pageview' OR event='$screen' OR event='$autocapture', uuid, NULL) AS Nullable(UUID))) as page_screen_autocapture_uniq_up_to,
-  
-      -- web vitals
-      argMinState(accurateCastOrNull(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(properties, '$web_vitals_LCP_value'), ''), 'null'), '^"|"$', ''), 'Float64'), timestamp) as vitals_lcp
-  FROM posthog_test.sharded_events
-  WHERE bitAnd(bitShiftRight(toUInt128(accurateCastOrNull(`$session_id`, 'UUID')), 76), 0xF) == 7 -- has a session id and is valid uuidv7)
-  GROUP BY
-      team_id,
-      toStartOfHour(fromUnixTimestamp(intDiv(toUInt64(bitShiftRight(session_id_v7, 80)), 1000))),
-      cityHash64(session_id_v7),
-      session_id_v7
-  
-  
-  '''
-# ---
-# name: test_create_table_query[session_recording_events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS session_recording_events ON CLUSTER 'posthog'
-  (
-      uuid UUID,
-      timestamp DateTime64(6, 'UTC'),
-      team_id Int64,
-      distinct_id VARCHAR,
-      session_id VARCHAR,
-      window_id VARCHAR,
-      snapshot_data VARCHAR,
-      created_at DateTime64(6, 'UTC')
-      , has_full_snapshot Int8 COMMENT 'column_materializer::has_full_snapshot', events_summary Array(String) COMMENT 'column_materializer::events_summary', click_count Int8 COMMENT 'column_materializer::click_count', keypress_count Int8 COMMENT 'column_materializer::keypress_count', timestamps_summary Array(DateTime64(6, 'UTC')) COMMENT 'column_materializer::timestamps_summary', first_event_timestamp Nullable(DateTime64(6, 'UTC')) COMMENT 'column_materializer::first_event_timestamp', last_event_timestamp Nullable(DateTime64(6, 'UTC')) COMMENT 'column_materializer::last_event_timestamp', urls Array(String) COMMENT 'column_materializer::urls'
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  
-  ) ENGINE = Distributed('posthog', 'posthog_test', 'sharded_session_recording_events', sipHash64(distinct_id))
-  
-  '''
-# ---
-# name: test_create_table_query[session_recording_events_mv]
-  '''
-  
-  CREATE MATERIALIZED VIEW IF NOT EXISTS session_recording_events_mv ON CLUSTER 'posthog'
-  TO posthog_test.writable_session_recording_events
-  AS SELECT
-  uuid,
-  timestamp,
-  team_id,
-  distinct_id,
-  session_id,
-  window_id,
-  snapshot_data,
-  created_at,
-  _timestamp,
-  _offset
-  FROM posthog_test.kafka_session_recording_events
-  
-  '''
-# ---
-# name: test_create_table_query[session_replay_events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS session_replay_events ON CLUSTER 'posthog'
-  (
-      -- part of order by so will aggregate correctly
-      session_id VARCHAR,
-      -- part of order by so will aggregate correctly
-      team_id Int64,
-      -- ClickHouse will pick any value of distinct_id for the session
-      -- this is fine since even if the distinct_id changes during a session
-      -- it will still (or should still) map to the same person
-      distinct_id VARCHAR,
-      min_first_timestamp SimpleAggregateFunction(min, DateTime64(6, 'UTC')),
-      max_last_timestamp SimpleAggregateFunction(max, DateTime64(6, 'UTC')),
-      first_url AggregateFunction(argMin, Nullable(VARCHAR), DateTime64(6, 'UTC')),
-      click_count SimpleAggregateFunction(sum, Int64),
-      keypress_count SimpleAggregateFunction(sum, Int64),
-      mouse_activity_count SimpleAggregateFunction(sum, Int64),
-      active_milliseconds SimpleAggregateFunction(sum, Int64),
-      console_log_count SimpleAggregateFunction(sum, Int64),
-      console_warn_count SimpleAggregateFunction(sum, Int64),
-      console_error_count SimpleAggregateFunction(sum, Int64),
-      -- this column allows us to estimate the amount of data that is being ingested
-      size SimpleAggregateFunction(sum, Int64),
-      -- this allows us to count the number of messages received in a session
-      -- often very useful in incidents or debugging
-      message_count SimpleAggregateFunction(sum, Int64),
-      -- this allows us to count the number of snapshot events received in a session
-      -- often very useful in incidents or debugging
-      -- because we batch events we expect message_count to be lower than event_count
-      event_count SimpleAggregateFunction(sum, Int64),
-      -- which source the snapshots came from Android, iOS, Mobile, Web. Web if absent
-      snapshot_source AggregateFunction(argMin, LowCardinality(Nullable(String)), DateTime64(6, 'UTC')),
-      _timestamp SimpleAggregateFunction(max, DateTime)
-  ) ENGINE = Distributed('posthog', 'posthog_test', 'sharded_session_replay_events', sipHash64(distinct_id))
-  
-  '''
-# ---
-# name: test_create_table_query[session_replay_events_mv]
-  '''
-  
-  CREATE MATERIALIZED VIEW IF NOT EXISTS session_replay_events_mv ON CLUSTER 'posthog'
-  TO posthog_test.writable_session_replay_events (
-  `session_id` String, `team_id` Int64, `distinct_id` String,
-  `min_first_timestamp` DateTime64(6, 'UTC'),
-  `max_last_timestamp` DateTime64(6, 'UTC'),
-  `first_url` AggregateFunction(argMin, Nullable(String), DateTime64(6, 'UTC')),
-  `click_count` Int64, `keypress_count` Int64,
-  `mouse_activity_count` Int64, `active_milliseconds` Int64,
-  `console_log_count` Int64, `console_warn_count` Int64,
-  `console_error_count` Int64, `size` Int64, `message_count` Int64,
-  `event_count` Int64,
-  `snapshot_source` AggregateFunction(argMin, LowCardinality(Nullable(String)), DateTime64(6, 'UTC')),
-  `_timestamp` Nullable(DateTime)
-  )
-  AS SELECT
-  session_id,
-  team_id,
-  any(distinct_id) as distinct_id,
-  min(first_timestamp) AS min_first_timestamp,
-  max(last_timestamp) AS max_last_timestamp,
-  -- TRICKY: ClickHouse will pick a relatively random first_url
-  -- when it collapses the aggregating merge tree
-  -- unless we teach it what we want...
-  -- argMin ignores null values
-  -- so this will get the first non-null value of first_url
-  -- for each group of session_id and team_id
-  -- by min of first_timestamp in the batch
-  -- this is an aggregate function, not a simple aggregate function
-  -- so we have to write to argMinState, and query with argMinMerge
-  argMinState(first_url, first_timestamp) as first_url,
-  sum(click_count) as click_count,
-  sum(keypress_count) as keypress_count,
-  sum(mouse_activity_count) as mouse_activity_count,
-  sum(active_milliseconds) as active_milliseconds,
-  sum(console_log_count) as console_log_count,
-  sum(console_warn_count) as console_warn_count,
-  sum(console_error_count) as console_error_count,
-  sum(size) as size,
-  -- we can count the number of kafka messages instead of sending it explicitly
-  sum(message_count) as message_count,
-  sum(event_count) as event_count,
-  argMinState(snapshot_source, first_timestamp) as snapshot_source,
-  max(_timestamp) as _timestamp
-  FROM posthog_test.kafka_session_replay_events
-  group by session_id, team_id
-  
-  '''
-# ---
-# name: test_create_table_query[sessions]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sessions ON CLUSTER 'posthog'
-  (
-      -- part of order by so will aggregate correctly
-      session_id VARCHAR,
-      -- part of order by so will aggregate correctly
-      team_id Int64,
-      -- ClickHouse will pick any value of distinct_id for the session
-      -- this is fine since even if the distinct_id changes during a session
-      -- it will still (or should still) map to the same person
-      distinct_id SimpleAggregateFunction(any, String),
-  
-      min_timestamp SimpleAggregateFunction(min, DateTime64(6, 'UTC')),
-      max_timestamp SimpleAggregateFunction(max, DateTime64(6, 'UTC')),
-  
-      urls SimpleAggregateFunction(groupUniqArrayArray, Array(String)),
-      entry_url AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      exit_url AggregateFunction(argMax, String, DateTime64(6, 'UTC')),
-  
-      initial_referring_domain AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_source AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_campaign AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_medium AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_term AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_content AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gad_source AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gclsrc AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_dclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gbraid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_wbraid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_fbclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_msclkid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_twclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_li_fat_id AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_mc_cid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_igshid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_ttclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-  
-      -- create a map of how many times we saw each event
-      event_count_map SimpleAggregateFunction(sumMap, Map(String, Int64)),
-      -- duplicate the event count as a specific column for pageviews and autocaptures,
-      -- as these are used in some key queries and need to be fast
-      pageview_count SimpleAggregateFunction(sum, Int64),
-      autocapture_count SimpleAggregateFunction(sum, Int64),
-  ) ENGINE = Distributed('posthog', 'posthog_test', 'sharded_sessions', sipHash64(session_id))
-  
-  '''
-# ---
-# name: test_create_table_query[sessions_mv]
-  '''
-  
-  CREATE MATERIALIZED VIEW IF NOT EXISTS sessions_mv ON CLUSTER 'posthog'
-  TO posthog_test.writable_sessions
-  AS
-  
-  SELECT
-  
-  `$session_id` as session_id,
-  team_id,
-  
-  -- it doesn't matter which distinct_id gets picked (it'll be somewhat random) as they can all join to the right person
-  any(distinct_id) as distinct_id,
-  
-  min(timestamp) AS min_timestamp,
-  max(timestamp) AS max_timestamp,
-  
-  groupUniqArray(replaceRegexpAll(JSONExtractRaw(properties, '$current_url'), '^"|"$', '')) AS urls,
-  argMinState(replaceRegexpAll(JSONExtractRaw(properties, '$current_url'), '^"|"$', ''), timestamp) as entry_url,
-  argMaxState(replaceRegexpAll(JSONExtractRaw(properties, '$current_url'), '^"|"$', ''), timestamp) as exit_url,
-  
-  argMinState(replaceRegexpAll(JSONExtractRaw(properties, '$referring_domain'), '^"|"$', ''), timestamp) as initial_referring_domain,
-  argMinState(replaceRegexpAll(JSONExtractRaw(properties, 'utm_source'), '^"|"$', ''), timestamp) as initial_utm_source,
-  argMinState(replaceRegexpAll(JSONExtractRaw(properties, 'utm_campaign'), '^"|"$', ''), timestamp) as initial_utm_campaign,
-  argMinState(replaceRegexpAll(JSONExtractRaw(properties, 'utm_medium'), '^"|"$', ''), timestamp) as initial_utm_medium,
-  argMinState(replaceRegexpAll(JSONExtractRaw(properties, 'utm_term'), '^"|"$', ''), timestamp) as initial_utm_term,
-  argMinState(replaceRegexpAll(JSONExtractRaw(properties, 'utm_content'), '^"|"$', ''), timestamp) as initial_utm_content,
-  argMinState(replaceRegexpAll(JSONExtractRaw(properties, 'gclid'), '^"|"$', ''), timestamp) as initial_gclid,
-  argMinState(replaceRegexpAll(JSONExtractRaw(properties, 'gad_source'), '^"|"$', ''), timestamp) as initial_gad_source,
-  argMinState(replaceRegexpAll(JSONExtractRaw(properties, 'gclsrc'), '^"|"$', ''), timestamp) as initial_gclsrc,
-  argMinState(replaceRegexpAll(JSONExtractRaw(properties, 'dclid'), '^"|"$', ''), timestamp) as initial_dclid,
-  argMinState(replaceRegexpAll(JSONExtractRaw(properties, 'gbraid'), '^"|"$', ''), timestamp) as initial_gbraid,
-  argMinState(replaceRegexpAll(JSONExtractRaw(properties, 'wbraid'), '^"|"$', ''), timestamp) as initial_wbraid,
-  argMinState(replaceRegexpAll(JSONExtractRaw(properties, 'fbclid'), '^"|"$', ''), timestamp) as initial_fbclid,
-  argMinState(replaceRegexpAll(JSONExtractRaw(properties, 'msclkid'), '^"|"$', ''), timestamp) as initial_msclkid,
-  argMinState(replaceRegexpAll(JSONExtractRaw(properties, 'twclid'), '^"|"$', ''), timestamp) as initial_twclid,
-  argMinState(replaceRegexpAll(JSONExtractRaw(properties, 'li_fat_id'), '^"|"$', ''), timestamp) as initial_li_fat_id,
-  argMinState(replaceRegexpAll(JSONExtractRaw(properties, 'mc_cid'), '^"|"$', ''), timestamp) as initial_mc_cid,
-  argMinState(replaceRegexpAll(JSONExtractRaw(properties, 'igshid'), '^"|"$', ''), timestamp) as initial_igshid,
-  argMinState(replaceRegexpAll(JSONExtractRaw(properties, 'ttclid'), '^"|"$', ''), timestamp) as initial_ttclid,
-  
-  sumMap(CAST(([event], [1]), 'Map(String, UInt64)')) as event_count_map,
-  sumIf(1, event='$pageview') as pageview_count,
-  sumIf(1, event='$autocapture') as autocapture_count
-  
-  FROM posthog_test.sharded_events
-  WHERE `$session_id` IS NOT NULL AND `$session_id` != ''
-  GROUP BY `$session_id`, team_id
-  
-  
-  '''
-# ---
-# name: test_create_table_query[sharded_app_metrics2]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sharded_app_metrics2 ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      timestamp DateTime64(6, 'UTC'),
-      -- The name of the service or product that generated the metrics.
-      -- Examples: plugins, hog
-      app_source LowCardinality(String),
-      -- An id for the app source.
-      -- Set app_source to avoid collision with ids from other app sources if the id generation is not safe.
-      -- Examples: A plugin id, a hog application id
-      app_source_id String,
-      -- A secondary id e.g. for the instance of app_source that generated this metric.
-      -- This may be ommitted if app_source is a singleton.
-      -- Examples: A plugin config id, a hog application config id
-      instance_id String,
-      metric_kind LowCardinality(String),
-      metric_name LowCardinality(String),
-      count SimpleAggregateFunction(sum, Int64)
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  , _partition UInt64
-  
-  )
-  ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_{shard}/posthog.sharded_app_metrics2', '{replica}')
-  PARTITION BY toYYYYMM(timestamp)
-  ORDER BY (team_id, app_source, app_source_id, instance_id, toStartOfHour(timestamp), metric_kind, metric_name)
-  
-  
-  '''
-# ---
-# name: test_create_table_query[sharded_app_metrics]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sharded_app_metrics ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      timestamp DateTime64(6, 'UTC'),
-      plugin_config_id Int64,
-      category LowCardinality(String),
-      job_id String,
-      successes SimpleAggregateFunction(sum, Int64),
-      successes_on_retry SimpleAggregateFunction(sum, Int64),
-      failures SimpleAggregateFunction(sum, Int64),
-      error_uuid UUID,
-      error_type String,
-      error_details String CODEC(ZSTD(3))
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  , _partition UInt64
-  
-  )
-  ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_{shard}/posthog.sharded_app_metrics', '{replica}')
-  PARTITION BY toYYYYMM(timestamp)
-  ORDER BY (team_id, plugin_config_id, job_id, category, toStartOfHour(timestamp), error_type, error_uuid)
-  
-  '''
-# ---
-# name: test_create_table_query[sharded_events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sharded_events ON CLUSTER 'posthog'
-  (
-      uuid UUID,
-      event VARCHAR,
-      properties VARCHAR CODEC(ZSTD(3)),
-      timestamp DateTime64(6, 'UTC'),
-      team_id Int64,
-      distinct_id VARCHAR,
-      elements_chain VARCHAR,
-      created_at DateTime64(6, 'UTC'),
-      person_id UUID,
-      person_created_at DateTime64,
-      person_properties VARCHAR Codec(ZSTD(3)),
-      group0_properties VARCHAR Codec(ZSTD(3)),
-      group1_properties VARCHAR Codec(ZSTD(3)),
-      group2_properties VARCHAR Codec(ZSTD(3)),
-      group3_properties VARCHAR Codec(ZSTD(3)),
-      group4_properties VARCHAR Codec(ZSTD(3)),
-      group0_created_at DateTime64,
-      group1_created_at DateTime64,
-      group2_created_at DateTime64,
-      group3_created_at DateTime64,
-      group4_created_at DateTime64,
-      person_mode Enum8('full' = 0, 'propertyless' = 1, 'force_upgrade' = 2)
-      
-      , $group_0 VARCHAR MATERIALIZED replaceRegexpAll(JSONExtractRaw(properties, '$group_0'), '^"|"$', '') COMMENT 'column_materializer::$group_0'
-      , $group_1 VARCHAR MATERIALIZED replaceRegexpAll(JSONExtractRaw(properties, '$group_1'), '^"|"$', '') COMMENT 'column_materializer::$group_1'
-      , $group_2 VARCHAR MATERIALIZED replaceRegexpAll(JSONExtractRaw(properties, '$group_2'), '^"|"$', '') COMMENT 'column_materializer::$group_2'
-      , $group_3 VARCHAR MATERIALIZED replaceRegexpAll(JSONExtractRaw(properties, '$group_3'), '^"|"$', '') COMMENT 'column_materializer::$group_3'
-      , $group_4 VARCHAR MATERIALIZED replaceRegexpAll(JSONExtractRaw(properties, '$group_4'), '^"|"$', '') COMMENT 'column_materializer::$group_4'
-      , $window_id VARCHAR MATERIALIZED replaceRegexpAll(JSONExtractRaw(properties, '$window_id'), '^"|"$', '') COMMENT 'column_materializer::$window_id'
-      , $session_id VARCHAR MATERIALIZED replaceRegexpAll(JSONExtractRaw(properties, '$session_id'), '^"|"$', '') COMMENT 'column_materializer::$session_id'
-      , elements_chain_href String MATERIALIZED extract(elements_chain, '(?::|")href="(.*?)"')
-      , elements_chain_texts Array(String) MATERIALIZED arrayDistinct(extractAll(elements_chain, '(?::|")text="(.*?)"'))
-      , elements_chain_ids Array(String) MATERIALIZED arrayDistinct(extractAll(elements_chain, '(?::|")attr_id="(.*?)"'))
-      , elements_chain_elements Array(Enum('a', 'button', 'form', 'input', 'select', 'textarea', 'label')) MATERIALIZED arrayDistinct(extractAll(elements_chain, '(?:^|;)(a|button|form|input|select|textarea|label)(?:\.|$|:)'))
-      , INDEX `minmax_$group_0` `$group_0` TYPE minmax GRANULARITY 1
-      , INDEX `minmax_$group_1` `$group_1` TYPE minmax GRANULARITY 1
-      , INDEX `minmax_$group_2` `$group_2` TYPE minmax GRANULARITY 1
-      , INDEX `minmax_$group_3` `$group_3` TYPE minmax GRANULARITY 1
-      , INDEX `minmax_$group_4` `$group_4` TYPE minmax GRANULARITY 1
-      , INDEX `minmax_$window_id` `$window_id` TYPE minmax GRANULARITY 1
-      , INDEX `minmax_$session_id` `$session_id` TYPE minmax GRANULARITY 1
-      ,                 properties_group_custom Map(String, String)
-                  MATERIALIZED mapSort(
-                      mapFilter((key, _) -> key NOT LIKE '$%' AND key NOT IN ('token', 'distinct_id', 'utm_source', 'utm_medium', 'utm_campaign', 'utm_content', 'utm_term', 'gclid', 'gad_source', 'gclsrc', 'dclid', 'gbraid', 'wbraid', 'fbclid', 'msclkid', 'twclid', 'li_fat_id', 'mc_cid', 'igshid', 'ttclid', 'rdt_cid'),
-                      CAST(JSONExtractKeysAndValues(properties, 'String'), 'Map(String, String)'))
-                  )
-                  CODEC(ZSTD(1))
-              , INDEX properties_group_custom_keys_bf mapKeys(properties_group_custom) TYPE bloom_filter, INDEX properties_group_custom_values_bf mapValues(properties_group_custom) TYPE bloom_filter,                 properties_group_feature_flags Map(String, String)
-                  MATERIALIZED mapSort(
-                      mapFilter((key, _) -> key like '$feature/%',
-                      CAST(JSONExtractKeysAndValues(properties, 'String'), 'Map(String, String)'))
-                  )
-                  CODEC(ZSTD(1))
-              , INDEX properties_group_feature_flags_keys_bf mapKeys(properties_group_feature_flags) TYPE bloom_filter, INDEX properties_group_feature_flags_values_bf mapValues(properties_group_feature_flags) TYPE bloom_filter
-  
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  , inserted_at Nullable(DateTime64(6, 'UTC')) DEFAULT NULL
-      
-      , INDEX kafka_timestamp_minmax_sharded_events _timestamp TYPE minmax GRANULARITY 3
-      
-  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_{shard}/posthog.events', '{replica}', _timestamp)
-  PARTITION BY toYYYYMM(timestamp)
-  ORDER BY (team_id, toDate(timestamp), event, cityHash64(distinct_id), cityHash64(uuid))
-  SAMPLE BY cityHash64(distinct_id)
-  
-  
-  '''
-# ---
-# name: test_create_table_query[sharded_heatmaps]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sharded_heatmaps ON CLUSTER 'posthog'
-  (
-      session_id VARCHAR,
-      team_id Int64,
-      distinct_id VARCHAR,
-      timestamp DateTime64(6, 'UTC'),
-      -- x is the x with resolution applied, the resolution converts high fidelity mouse positions into an NxN grid
-      x Int16,
-      -- y is the y with resolution applied, the resolution converts high fidelity mouse positions into an NxN grid
-      y Int16,
-      -- stored so that in future we can support other resolutions
-      scale_factor Int16,
-      viewport_width Int16,
-      viewport_height Int16,
-      -- some elements move when the page scrolls, others do not
-      pointer_target_fixed Bool,
-      current_url VARCHAR,
-      type LowCardinality(String),
-      _timestamp DateTime,
-      _offset UInt64,
-      _partition UInt64
-  ) ENGINE = ReplicatedMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_{shard}/posthog.heatmaps', '{replica}')
-  
-      PARTITION BY toYYYYMM(timestamp)
-      -- almost always this is being queried by
-      --   * type,
-      --   * team_id,
-      --   * date range,
-      --   * URL (maybe matching wild cards),
-      --   * width
-      -- we'll almost never query this by session id
-      -- so from least to most cardinality that's
-      ORDER BY (type, team_id,  toDate(timestamp), current_url, viewport_width)
-      
-  -- I am purposefully not setting index granularity
-  -- the default is 8192, and we will be loading a lot of data
-  -- per query, we tend to copy this 512 around the place but
-  -- i don't think it applies here
-  
-  '''
-# ---
-# name: test_create_table_query[sharded_ingestion_warnings]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sharded_ingestion_warnings ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      source LowCardinality(VARCHAR),
-      type VARCHAR,
-      details VARCHAR CODEC(ZSTD(3)),
-      timestamp DateTime64(6, 'UTC')
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  , _partition UInt64
-  
-  ) ENGINE = ReplicatedMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_{shard}/posthog.sharded_ingestion_warnings', '{replica}')
-  PARTITION BY toYYYYMMDD(timestamp)
-  ORDER BY (team_id, toHour(timestamp), type, source, timestamp)
-  
-  '''
-# ---
-# name: test_create_table_query[sharded_performance_events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sharded_performance_events ON CLUSTER 'posthog'
-  (
-      uuid UUID,
-  session_id String,
-  window_id String,
-  pageview_id String,
-  distinct_id String,
-  timestamp DateTime64,
-  time_origin DateTime64(3, 'UTC'),
-  entry_type LowCardinality(String),
-  name String,
-  team_id Int64,
-  current_url String,
-  start_time Float64,
-  duration Float64,
-  redirect_start Float64,
-  redirect_end Float64,
-  worker_start Float64,
-  fetch_start Float64,
-  domain_lookup_start Float64,
-  domain_lookup_end Float64,
-  connect_start Float64,
-  secure_connection_start Float64,
-  connect_end Float64,
-  request_start Float64,
-  response_start Float64,
-  response_end Float64,
-  decoded_body_size Int64,
-  encoded_body_size Int64,
-  initiator_type LowCardinality(String),
-  next_hop_protocol LowCardinality(String),
-  render_blocking_status LowCardinality(String),
-  response_status Int64,
-  transfer_size Int64,
-  largest_contentful_paint_element String,
-  largest_contentful_paint_render_time Float64,
-  largest_contentful_paint_load_time Float64,
-  largest_contentful_paint_size Float64,
-  largest_contentful_paint_id String,
-  largest_contentful_paint_url String,
-  dom_complete Float64,
-  dom_content_loaded_event Float64,
-  dom_interactive Float64,
-  load_event_end Float64,
-  load_event_start Float64,
-  redirect_count Int64,
-  navigation_type LowCardinality(String),
-  unload_event_end Float64,
-  unload_event_start Float64
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  , _partition UInt64
-  
-  ) ENGINE = ReplicatedMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_{shard}/posthog.performance_events', '{replica}')
-  PARTITION BY toYYYYMM(timestamp)
-  ORDER BY (team_id, toDate(timestamp), session_id, pageview_id, timestamp)
-  
-  
-  
-  '''
-# ---
-# name: test_create_table_query[sharded_raw_sessions]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sharded_raw_sessions ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      session_id_v7 UInt128, -- integer representation of a uuidv7
-  
-      -- ClickHouse will pick the latest value of distinct_id for the session
-      -- this is fine since even if the distinct_id changes during a session
-      distinct_id AggregateFunction(argMax, String, DateTime64(6, 'UTC')),
-  
-      min_timestamp SimpleAggregateFunction(min, DateTime64(6, 'UTC')),
-      max_timestamp SimpleAggregateFunction(max, DateTime64(6, 'UTC')),
-  
-      -- urls
-      urls SimpleAggregateFunction(groupUniqArrayArray, Array(String)),
-      entry_url AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      end_url AggregateFunction(argMax, String, DateTime64(6, 'UTC')),
-      last_external_click_url AggregateFunction(argMax, String, DateTime64(6, 'UTC')),
-  
-      -- device
-      initial_browser AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_browser_version AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_os AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_os_version AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_device_type AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_viewport_width AggregateFunction(argMin, Int64, DateTime64(6, 'UTC')),
-      initial_viewport_height AggregateFunction(argMin, Int64, DateTime64(6, 'UTC')),
-  
-      -- geoip
-      -- only store the properties we actually use, as there's tons, see https://posthog.com/docs/cdp/geoip-enrichment
-      initial_geoip_country_code AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_geoip_subdivision_1_code AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_geoip_subdivision_1_name AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_geoip_subdivision_city_name AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_geoip_time_zone AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-  
-      -- attribution
-      initial_referring_domain AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_source AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_campaign AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_medium AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_term AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_content AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gad_source AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gclsrc AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_dclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gbraid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_wbraid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_fbclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_msclkid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_twclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_li_fat_id AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_mc_cid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_igshid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_ttclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-  
-      -- Count pageview, autocapture, and screen events for providing totals.
-      -- It's unclear if we can use the counts as they are not idempotent, and we had a bug on EU where events were
-      -- double-counted, so the counts were wrong. To get around this, also keep track of the unique uuids. This will be
-      -- slower and more expensive to store, but will be correct even if events are double-counted, so can be used to
-      -- verify correctness and as a backup. Ideally we will be able to delete the uniq columns in the future when we're
-      -- satisfied that counts are accurate.
-      pageview_count SimpleAggregateFunction(sum, Int64),
-      pageview_uniq AggregateFunction(uniq, Nullable(UUID)),
-      autocapture_count SimpleAggregateFunction(sum, Int64),
-      autocapture_uniq AggregateFunction(uniq, Nullable(UUID)),
-      screen_count SimpleAggregateFunction(sum, Int64),
-      screen_uniq AggregateFunction(uniq, Nullable(UUID)),
-  
-      -- replay
-      maybe_has_session_replay SimpleAggregateFunction(max, Bool), -- will be written False to by the events table mv and True to by the replay table mv
-  
-      -- as a performance optimisation, also keep track of the uniq events for all of these combined, a bounce is a session with <2 of these
-      page_screen_autocapture_uniq_up_to AggregateFunction(uniqUpTo(1), Nullable(UUID)),
-  
-      -- web vitals
-      vitals_lcp AggregateFunction(argMin, Nullable(Float64), DateTime64(6, 'UTC'))
-  ) ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_{shard}/posthog.raw_sessions', '{replica}')
-  
-  PARTITION BY toYYYYMM(fromUnixTimestamp(intDiv(toUInt64(bitShiftRight(session_id_v7, 80)), 1000)))
-  ORDER BY (
-      team_id,
-      toStartOfHour(fromUnixTimestamp(intDiv(toUInt64(bitShiftRight(session_id_v7, 80)), 1000))),
-      cityHash64(session_id_v7),
-      session_id_v7
-  )
-  SAMPLE BY cityHash64(session_id_v7)
-  
-  '''
-# ---
-# name: test_create_table_query[sharded_session_recording_events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sharded_session_recording_events ON CLUSTER 'posthog'
-  (
-      uuid UUID,
-      timestamp DateTime64(6, 'UTC'),
-      team_id Int64,
-      distinct_id VARCHAR,
-      session_id VARCHAR,
-      window_id VARCHAR,
-      snapshot_data VARCHAR,
-      created_at DateTime64(6, 'UTC')
-      , has_full_snapshot Int8 MATERIALIZED JSONExtractBool(snapshot_data, 'has_full_snapshot'), events_summary Array(String) MATERIALIZED JSONExtract(JSON_QUERY(snapshot_data, '$.events_summary[*]'), 'Array(String)'), click_count Int8 MATERIALIZED length(arrayFilter((x) -> JSONExtractInt(x, 'type') = 3 AND JSONExtractInt(x, 'data', 'source') = 2, events_summary)), keypress_count Int8 MATERIALIZED length(arrayFilter((x) -> JSONExtractInt(x, 'type') = 3 AND JSONExtractInt(x, 'data', 'source') = 5, events_summary)), timestamps_summary Array(DateTime64(6, 'UTC')) MATERIALIZED arraySort(arrayMap((x) -> toDateTime(JSONExtractInt(x, 'timestamp') / 1000), events_summary)), first_event_timestamp Nullable(DateTime64(6, 'UTC')) MATERIALIZED if(empty(timestamps_summary), NULL, arrayReduce('min', timestamps_summary)), last_event_timestamp Nullable(DateTime64(6, 'UTC')) MATERIALIZED if(empty(timestamps_summary), NULL, arrayReduce('max', timestamps_summary)), urls Array(String) MATERIALIZED arrayFilter(x -> x != '', arrayMap((x) -> JSONExtractString(x, 'data', 'href'), events_summary))
-      
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  
-      , INDEX kafka_timestamp_minmax_sharded_session_recording_events _timestamp TYPE minmax GRANULARITY 3
-      
-  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_{shard}/posthog.session_recording_events', '{replica}', _timestamp)
-  PARTITION BY toYYYYMMDD(timestamp)
-  ORDER BY (team_id, toHour(timestamp), session_id, timestamp, uuid)
-  
-  SETTINGS index_granularity=512
-  
-  '''
-# ---
-# name: test_create_table_query[sharded_session_replay_events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sharded_session_replay_events ON CLUSTER 'posthog'
-  (
-      -- part of order by so will aggregate correctly
-      session_id VARCHAR,
-      -- part of order by so will aggregate correctly
-      team_id Int64,
-      -- ClickHouse will pick any value of distinct_id for the session
-      -- this is fine since even if the distinct_id changes during a session
-      -- it will still (or should still) map to the same person
-      distinct_id VARCHAR,
-      min_first_timestamp SimpleAggregateFunction(min, DateTime64(6, 'UTC')),
-      max_last_timestamp SimpleAggregateFunction(max, DateTime64(6, 'UTC')),
-      first_url AggregateFunction(argMin, Nullable(VARCHAR), DateTime64(6, 'UTC')),
-      click_count SimpleAggregateFunction(sum, Int64),
-      keypress_count SimpleAggregateFunction(sum, Int64),
-      mouse_activity_count SimpleAggregateFunction(sum, Int64),
-      active_milliseconds SimpleAggregateFunction(sum, Int64),
-      console_log_count SimpleAggregateFunction(sum, Int64),
-      console_warn_count SimpleAggregateFunction(sum, Int64),
-      console_error_count SimpleAggregateFunction(sum, Int64),
-      -- this column allows us to estimate the amount of data that is being ingested
-      size SimpleAggregateFunction(sum, Int64),
-      -- this allows us to count the number of messages received in a session
-      -- often very useful in incidents or debugging
-      message_count SimpleAggregateFunction(sum, Int64),
-      -- this allows us to count the number of snapshot events received in a session
-      -- often very useful in incidents or debugging
-      -- because we batch events we expect message_count to be lower than event_count
-      event_count SimpleAggregateFunction(sum, Int64),
-      -- which source the snapshots came from Android, iOS, Mobile, Web. Web if absent
-      snapshot_source AggregateFunction(argMin, LowCardinality(Nullable(String)), DateTime64(6, 'UTC')),
-      _timestamp SimpleAggregateFunction(max, DateTime)
-  ) ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_{shard}/posthog.session_replay_events', '{replica}')
-  
-      PARTITION BY toYYYYMM(min_first_timestamp)
-      -- order by is used by the aggregating merge tree engine to
-      -- identify candidates to merge, e.g. toDate(min_first_timestamp)
-      -- would mean we would have one row per day per session_id
-      -- if CH could completely merge to match the order by
-      -- it is also used to organise data to make queries faster
-      -- we want the fewest rows possible but also the fastest queries
-      -- since we query by date and not by time
-      -- and order by must be in order of increasing cardinality
-      -- so we order by date first, then team_id, then session_id
-      -- hopefully, this is a good balance between the two
-      ORDER BY (toDate(min_first_timestamp), team_id, session_id)
-  SETTINGS index_granularity=512
-  
-  '''
-# ---
-# name: test_create_table_query[sharded_sessions]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sharded_sessions ON CLUSTER 'posthog'
-  (
-      -- part of order by so will aggregate correctly
-      session_id VARCHAR,
-      -- part of order by so will aggregate correctly
-      team_id Int64,
-      -- ClickHouse will pick any value of distinct_id for the session
-      -- this is fine since even if the distinct_id changes during a session
-      -- it will still (or should still) map to the same person
-      distinct_id SimpleAggregateFunction(any, String),
-  
-      min_timestamp SimpleAggregateFunction(min, DateTime64(6, 'UTC')),
-      max_timestamp SimpleAggregateFunction(max, DateTime64(6, 'UTC')),
-  
-      urls SimpleAggregateFunction(groupUniqArrayArray, Array(String)),
-      entry_url AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      exit_url AggregateFunction(argMax, String, DateTime64(6, 'UTC')),
-  
-      initial_referring_domain AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_source AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_campaign AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_medium AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_term AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_content AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gad_source AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gclsrc AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_dclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gbraid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_wbraid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_fbclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_msclkid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_twclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_li_fat_id AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_mc_cid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_igshid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_ttclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-  
-      -- create a map of how many times we saw each event
-      event_count_map SimpleAggregateFunction(sumMap, Map(String, Int64)),
-      -- duplicate the event count as a specific column for pageviews and autocaptures,
-      -- as these are used in some key queries and need to be fast
-      pageview_count SimpleAggregateFunction(sum, Int64),
-      autocapture_count SimpleAggregateFunction(sum, Int64),
-  ) ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_{shard}/posthog.sessions', '{replica}')
-  
-      PARTITION BY toYYYYMM(min_timestamp)
-      -- order by is used by the aggregating merge tree engine to
-      -- identify candidates to merge, e.g. toDate(min_timestamp)
-      -- would mean we would have one row per day per session_id
-      -- if CH could completely merge to match the order by
-      -- it is also used to organise data to make queries faster
-      -- we want the fewest rows possible but also the fastest queries
-      -- since we query by date and not by time
-      -- and order by must be in order of increasing cardinality
-      -- so we order by date first, then team_id, then session_id
-      -- hopefully, this is a good balance between the two
-      ORDER BY (toStartOfDay(min_timestamp), team_id, session_id)
-  SETTINGS index_granularity=512
-  
-  '''
-# ---
-# name: test_create_table_query[writable_events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS writable_events ON CLUSTER 'posthog'
-  (
-      uuid UUID,
-      event VARCHAR,
-      properties VARCHAR CODEC(ZSTD(3)),
-      timestamp DateTime64(6, 'UTC'),
-      team_id Int64,
-      distinct_id VARCHAR,
-      elements_chain VARCHAR,
-      created_at DateTime64(6, 'UTC'),
-      person_id UUID,
-      person_created_at DateTime64,
-      person_properties VARCHAR Codec(ZSTD(3)),
-      group0_properties VARCHAR Codec(ZSTD(3)),
-      group1_properties VARCHAR Codec(ZSTD(3)),
-      group2_properties VARCHAR Codec(ZSTD(3)),
-      group3_properties VARCHAR Codec(ZSTD(3)),
-      group4_properties VARCHAR Codec(ZSTD(3)),
-      group0_created_at DateTime64,
-      group1_created_at DateTime64,
-      group2_created_at DateTime64,
-      group3_created_at DateTime64,
-      group4_created_at DateTime64,
-      person_mode Enum8('full' = 0, 'propertyless' = 1, 'force_upgrade' = 2)
-      
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  , inserted_at Nullable(DateTime64(6, 'UTC')) DEFAULT NULL
-      
-  ) ENGINE = Distributed('posthog', 'posthog_test', 'sharded_events', sipHash64(distinct_id))
-  
-  '''
-# ---
-# name: test_create_table_query[writable_heatmaps]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS writable_heatmaps ON CLUSTER 'posthog'
-  (
-      session_id VARCHAR,
-      team_id Int64,
-      distinct_id VARCHAR,
-      timestamp DateTime64(6, 'UTC'),
-      -- x is the x with resolution applied, the resolution converts high fidelity mouse positions into an NxN grid
-      x Int16,
-      -- y is the y with resolution applied, the resolution converts high fidelity mouse positions into an NxN grid
-      y Int16,
-      -- stored so that in future we can support other resolutions
-      scale_factor Int16,
-      viewport_width Int16,
-      viewport_height Int16,
-      -- some elements move when the page scrolls, others do not
-      pointer_target_fixed Bool,
-      current_url VARCHAR,
-      type LowCardinality(String),
-      _timestamp DateTime,
-      _offset UInt64,
-      _partition UInt64
-  ) ENGINE = Distributed('posthog', 'posthog_test', 'sharded_heatmaps', cityHash64(concat(toString(team_id), '-', session_id, '-', toString(toDate(timestamp)))))
-  
-  '''
-# ---
-# name: test_create_table_query[writable_raw_sessions]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS writable_raw_sessions ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      session_id_v7 UInt128, -- integer representation of a uuidv7
-  
-      -- ClickHouse will pick the latest value of distinct_id for the session
-      -- this is fine since even if the distinct_id changes during a session
-      distinct_id AggregateFunction(argMax, String, DateTime64(6, 'UTC')),
-  
-      min_timestamp SimpleAggregateFunction(min, DateTime64(6, 'UTC')),
-      max_timestamp SimpleAggregateFunction(max, DateTime64(6, 'UTC')),
-  
-      -- urls
-      urls SimpleAggregateFunction(groupUniqArrayArray, Array(String)),
-      entry_url AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      end_url AggregateFunction(argMax, String, DateTime64(6, 'UTC')),
-      last_external_click_url AggregateFunction(argMax, String, DateTime64(6, 'UTC')),
-  
-      -- device
-      initial_browser AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_browser_version AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_os AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_os_version AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_device_type AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_viewport_width AggregateFunction(argMin, Int64, DateTime64(6, 'UTC')),
-      initial_viewport_height AggregateFunction(argMin, Int64, DateTime64(6, 'UTC')),
-  
-      -- geoip
-      -- only store the properties we actually use, as there's tons, see https://posthog.com/docs/cdp/geoip-enrichment
-      initial_geoip_country_code AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_geoip_subdivision_1_code AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_geoip_subdivision_1_name AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_geoip_subdivision_city_name AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_geoip_time_zone AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-  
-      -- attribution
-      initial_referring_domain AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_source AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_campaign AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_medium AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_term AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_content AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gad_source AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gclsrc AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_dclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gbraid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_wbraid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_fbclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_msclkid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_twclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_li_fat_id AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_mc_cid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_igshid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_ttclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-  
-      -- Count pageview, autocapture, and screen events for providing totals.
-      -- It's unclear if we can use the counts as they are not idempotent, and we had a bug on EU where events were
-      -- double-counted, so the counts were wrong. To get around this, also keep track of the unique uuids. This will be
-      -- slower and more expensive to store, but will be correct even if events are double-counted, so can be used to
-      -- verify correctness and as a backup. Ideally we will be able to delete the uniq columns in the future when we're
-      -- satisfied that counts are accurate.
-      pageview_count SimpleAggregateFunction(sum, Int64),
-      pageview_uniq AggregateFunction(uniq, Nullable(UUID)),
-      autocapture_count SimpleAggregateFunction(sum, Int64),
-      autocapture_uniq AggregateFunction(uniq, Nullable(UUID)),
-      screen_count SimpleAggregateFunction(sum, Int64),
-      screen_uniq AggregateFunction(uniq, Nullable(UUID)),
-  
-      -- replay
-      maybe_has_session_replay SimpleAggregateFunction(max, Bool), -- will be written False to by the events table mv and True to by the replay table mv
-  
-      -- as a performance optimisation, also keep track of the uniq events for all of these combined, a bounce is a session with <2 of these
-      page_screen_autocapture_uniq_up_to AggregateFunction(uniqUpTo(1), Nullable(UUID)),
-  
-      -- web vitals
-      vitals_lcp AggregateFunction(argMin, Nullable(Float64), DateTime64(6, 'UTC'))
-  ) ENGINE = Distributed('posthog', 'posthog_test', 'sharded_raw_sessions', cityHash64(session_id_v7))
-  
-  '''
-# ---
-# name: test_create_table_query[writable_session_recording_events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS writable_session_recording_events ON CLUSTER 'posthog'
-  (
-      uuid UUID,
-      timestamp DateTime64(6, 'UTC'),
-      team_id Int64,
-      distinct_id VARCHAR,
-      session_id VARCHAR,
-      window_id VARCHAR,
-      snapshot_data VARCHAR,
-      created_at DateTime64(6, 'UTC')
-      
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  
-  ) ENGINE = Distributed('posthog', 'posthog_test', 'sharded_session_recording_events', sipHash64(distinct_id))
-  
-  '''
-# ---
-# name: test_create_table_query[writable_sessions]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS writable_sessions ON CLUSTER 'posthog'
-  (
-      -- part of order by so will aggregate correctly
-      session_id VARCHAR,
-      -- part of order by so will aggregate correctly
-      team_id Int64,
-      -- ClickHouse will pick any value of distinct_id for the session
-      -- this is fine since even if the distinct_id changes during a session
-      -- it will still (or should still) map to the same person
-      distinct_id SimpleAggregateFunction(any, String),
-  
-      min_timestamp SimpleAggregateFunction(min, DateTime64(6, 'UTC')),
-      max_timestamp SimpleAggregateFunction(max, DateTime64(6, 'UTC')),
-  
-      urls SimpleAggregateFunction(groupUniqArrayArray, Array(String)),
-      entry_url AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      exit_url AggregateFunction(argMax, String, DateTime64(6, 'UTC')),
-  
-      initial_referring_domain AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_source AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_campaign AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_medium AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_term AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_content AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gad_source AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gclsrc AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_dclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gbraid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_wbraid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_fbclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_msclkid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_twclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_li_fat_id AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_mc_cid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_igshid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_ttclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-  
-      -- create a map of how many times we saw each event
-      event_count_map SimpleAggregateFunction(sumMap, Map(String, Int64)),
-      -- duplicate the event count as a specific column for pageviews and autocaptures,
-      -- as these are used in some key queries and need to be fast
-      pageview_count SimpleAggregateFunction(sum, Int64),
-      autocapture_count SimpleAggregateFunction(sum, Int64),
-  ) ENGINE = Distributed('posthog', 'posthog_test', 'sharded_sessions', sipHash64(session_id))
-  
-  '''
-# ---
-# name: test_create_table_query[writeable_performance_events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS writeable_performance_events ON CLUSTER 'posthog'
-  (
-      uuid UUID,
-  session_id String,
-  window_id String,
-  pageview_id String,
-  distinct_id String,
-  timestamp DateTime64,
-  time_origin DateTime64(3, 'UTC'),
-  entry_type LowCardinality(String),
-  name String,
-  team_id Int64,
-  current_url String,
-  start_time Float64,
-  duration Float64,
-  redirect_start Float64,
-  redirect_end Float64,
-  worker_start Float64,
-  fetch_start Float64,
-  domain_lookup_start Float64,
-  domain_lookup_end Float64,
-  connect_start Float64,
-  secure_connection_start Float64,
-  connect_end Float64,
-  request_start Float64,
-  response_start Float64,
-  response_end Float64,
-  decoded_body_size Int64,
-  encoded_body_size Int64,
-  initiator_type LowCardinality(String),
-  next_hop_protocol LowCardinality(String),
-  render_blocking_status LowCardinality(String),
-  response_status Int64,
-  transfer_size Int64,
-  largest_contentful_paint_element String,
-  largest_contentful_paint_render_time Float64,
-  largest_contentful_paint_load_time Float64,
-  largest_contentful_paint_size Float64,
-  largest_contentful_paint_id String,
-  largest_contentful_paint_url String,
-  dom_complete Float64,
-  dom_content_loaded_event Float64,
-  dom_interactive Float64,
-  load_event_end Float64,
-  load_event_start Float64,
-  redirect_count Int64,
-  navigation_type LowCardinality(String),
-  unload_event_end Float64,
-  unload_event_start Float64
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  , _partition UInt64
-  
-  ) ENGINE = Distributed('posthog', 'posthog_test', 'sharded_performance_events', sipHash64(session_id))
-  
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[channel_definition]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS channel_definition ON CLUSTER 'posthog' (
-      domain String NOT NULL,
-      kind String NOT NULL,
-      domain_type String NULL,
-      type_if_paid String NULL,
-      type_if_organic String NULL
-  ) ENGINE = ReplicatedMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.channel_definition', '{replica}-{shard}')
-  ORDER BY (domain, kind);
-  
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[cohortpeople]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS cohortpeople ON CLUSTER 'posthog'
-  (
-      person_id UUID,
-      cohort_id Int64,
-      team_id Int64,
-      sign Int8,
-      version UInt64
-  ) ENGINE = ReplicatedCollapsingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.cohortpeople', '{replica}-{shard}', sign)
-  Order By (team_id, cohort_id, person_id, version)
-  
-  
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[events_dead_letter_queue]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS events_dead_letter_queue ON CLUSTER 'posthog'
-  (
-      id UUID,
-      event_uuid UUID,
-      event VARCHAR,
-      properties VARCHAR,
-      distinct_id VARCHAR,
-      team_id Int64,
-      elements_chain VARCHAR,
-      created_at DateTime64(6, 'UTC'),
-      ip VARCHAR,
-      site_url VARCHAR,
-      now DateTime64(6, 'UTC'),
-      raw_payload VARCHAR,
-      error_timestamp DateTime64(6, 'UTC'),
-      error_location VARCHAR,
-      error VARCHAR,
-      tags Array(VARCHAR)
-      
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  
-      , INDEX kafka_timestamp_minmax_events_dead_letter_queue _timestamp TYPE minmax GRANULARITY 3
-      
-  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.events_dead_letter_queue', '{replica}-{shard}', _timestamp)
-  ORDER BY (id, event_uuid, distinct_id, team_id)
-  
-  SETTINGS index_granularity=512
-  
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[groups]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS groups ON CLUSTER 'posthog'
-  (
-      group_type_index UInt8,
-      group_key VARCHAR,
-      created_at DateTime64,
-      team_id Int64,
-      group_properties VARCHAR
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  
-  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.groups', '{replica}-{shard}', _timestamp)
-  Order By (team_id, group_type_index, group_key)
-  SETTINGS storage_policy = 'hot_to_cold'
-  
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[log_entries]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS log_entries ON CLUSTER 'posthog'
-  (
-      team_id UInt64,
-      -- The name of the service or product that generated the logs.
-      -- Examples: batch_exports
-      log_source LowCardinality(String),
-      -- An id for the log source.
-      -- Set log_source to avoid collision with ids from other log sources if the id generation is not safe.
-      -- Examples: A batch export id, a cronjob id, a plugin id.
-      log_source_id String,
-      -- A secondary id e.g. for the instance of log_source that generated this log.
-      -- This may be ommitted if log_source is a singleton.
-      -- Examples: A batch export run id, a plugin_config id, a thread id, a process id, a machine id.
-      instance_id String,
-      -- Timestamp indicating when the log was generated.
-      timestamp DateTime64(6, 'UTC'),
-      -- The log level.
-      -- Examples: INFO, WARNING, DEBUG, ERROR.
-      level LowCardinality(String),
-      -- The actual log message.
-      message String
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  
-  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.log_entries', '{replica}-{shard}', _timestamp)
-  PARTITION BY toStartOfHour(timestamp) ORDER BY (team_id, log_source, log_source_id, instance_id, timestamp)
-  
-  SETTINGS index_granularity=512
-  
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[person]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS person ON CLUSTER 'posthog'
-  (
-      id UUID,
-      created_at DateTime64,
-      team_id Int64,
-      properties VARCHAR,
-      is_identified Int8,
-      is_deleted Int8,
-      version UInt64
-      
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  
-      , INDEX kafka_timestamp_minmax_person _timestamp TYPE minmax GRANULARITY 3
-      
-  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.person', '{replica}-{shard}', version)
-  Order By (team_id, id)
-  SETTINGS storage_policy = 'hot_to_cold'
-  
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[person_distinct_id2]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS person_distinct_id2 ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      distinct_id VARCHAR,
-      person_id UUID,
-      is_deleted Int8,
-      version Int64
-      
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  
-      , _partition UInt64
-      , INDEX kafka_timestamp_minmax_person_distinct_id2 _timestamp TYPE minmax GRANULARITY 3
-      
-  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.person_distinct_id2', '{replica}-{shard}', version)
-  
-      ORDER BY (team_id, distinct_id)
-      SETTINGS index_granularity = 512
-      
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[person_distinct_id]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS person_distinct_id ON CLUSTER 'posthog'
-  (
-      distinct_id VARCHAR,
-      person_id UUID,
-      team_id Int64,
-      _sign Int8 DEFAULT 1,
-      is_deleted Int8 ALIAS if(_sign==-1, 1, 0)
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  
-  ) ENGINE = ReplicatedCollapsingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.person_distinct_id', '{replica}-{shard}', _sign)
-  Order By (team_id, distinct_id, person_id)
-  SETTINGS storage_policy = 'hot_to_cold'
-  
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[person_distinct_id_overrides]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS person_distinct_id_overrides ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      distinct_id VARCHAR,
-      person_id UUID,
-      is_deleted Int8,
-      version Int64
-      
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  , _partition UInt64
-  
-      , INDEX kafka_timestamp_minmax_person_distinct_id_overrides _timestamp TYPE minmax GRANULARITY 3
-      
-  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.person_distinct_id_overrides', '{replica}-{shard}', version)
-  
-      ORDER BY (team_id, distinct_id)
-      SETTINGS index_granularity = 512
-      
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[person_overrides]
-  '''
-  
-      CREATE TABLE IF NOT EXISTS `posthog_test`.`person_overrides`
-      ON CLUSTER 'posthog' (
-          team_id INT NOT NULL,
-  
-          -- When we merge two people `old_person_id` and `override_person_id`, we
-          -- want to keep track of a mapping from the `old_person_id` to the
-          -- `override_person_id`. This allows us to join with the
-          -- `sharded_events` table to find all events that were associated with
-          -- the `old_person_id` and update them to be associated with the
-          -- `override_person_id`.
-          old_person_id UUID NOT NULL,
-          override_person_id UUID NOT NULL,
-  
-          -- The timestamp the merge of the two people was completed.
-          merged_at DateTime64(6, 'UTC') NOT NULL,
-          -- The timestamp of the oldest event associated with the
-          -- `old_person_id`.
-          oldest_event DateTime64(6, 'UTC') NOT NULL,
-          -- The timestamp rows are created. This isn't part of the JOIN process
-          -- with the events table but rather a housekeeping column to allow us to
-          -- see when the row was created. This shouldn't have any impact of the
-          -- JOIN as it will be stored separately with the Wide ClickHouse table
-          -- storage.
-          created_at DateTime64(6, 'UTC') DEFAULT now(),
-  
-          -- the specific version of the `old_person_id` mapping. This is used to
-          -- allow us to discard old mappings as new ones are added. This version
-          -- will be provided by the corresponding PostgreSQL
-          --`posthog_personoverrides` table
-          version INT NOT NULL
-      )
-  
-      -- By specifying Replacing merge tree on version, we allow ClickHouse to
-      -- discard old versions of a `old_person_id` mapping. This should help keep
-      -- performance in check as new versions are added. Note that given we can
-      -- have partitioning by `oldest_event` which will change as we update
-      -- `person_id` on old partitions.
-      --
-      -- We also need to ensure that the data is replicated to all replicas in the
-      -- cluster, as we do not have any constraints on person_id and which shard
-      -- associated events are on. To do this we use the ReplicatedReplacingMergeTree
-      -- engine specifying a static `zk_path`. This will cause the Engine to
-      -- consider all replicas as the same. See
-      -- https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/replication
-      -- for details.
-      ENGINE = ReplicatedReplacingMergeTree(
-          -- NOTE: for testing we use a uuid to ensure that we don't get conflicts
-          -- when the tests tear down and recreate the table.
-          '/clickhouse/tables/{uuid}noshard/posthog_test.person_overrides',
-          '{replica}-{shard}',
-          version
-      )
-  
-      -- We partition the table by the `oldest_event` column. This allows us to
-      -- handle updating the events table partition by partition, progressing each
-      -- override partition by partition in lockstep with the events table. Note
-      -- that this means it is possible that we have a mapping from
-      -- `old_person_id` in multiple partitions during the merge process.
-      PARTITION BY toYYYYMM(oldest_event)
-  
-      -- We want to collapse down on the `old_person_id` such that we end up with
-      -- the newest known mapping for it in the table. Query side we will need to
-      -- ensure that we are always querying the latest version of the mapping.
-      ORDER BY (team_id, old_person_id)
-  
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[person_static_cohort]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS person_static_cohort ON CLUSTER 'posthog'
-  (
-      id UUID,
-      person_id UUID,
-      cohort_id Int64,
-      team_id Int64
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  
-  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.person_static_cohort', '{replica}-{shard}', _timestamp)
-  Order By (team_id, cohort_id, person_id, id)
-  SETTINGS storage_policy = 'hot_to_cold'
-  
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[plugin_log_entries]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS plugin_log_entries ON CLUSTER 'posthog'
-  (
-      id UUID,
-      team_id Int64,
-      plugin_id Int64,
-      plugin_config_id Int64,
-      timestamp DateTime64(6, 'UTC'),
-      source VARCHAR,
-      type VARCHAR,
-      message VARCHAR,
-      instance_id UUID
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  
-  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_noshard/posthog.plugin_log_entries', '{replica}-{shard}', _timestamp)
-  PARTITION BY toYYYYMMDD(timestamp) ORDER BY (team_id, plugin_id, plugin_config_id, timestamp)
-  
-  SETTINGS index_granularity=512
-  
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[sharded_app_metrics2]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sharded_app_metrics2 ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      timestamp DateTime64(6, 'UTC'),
-      -- The name of the service or product that generated the metrics.
-      -- Examples: plugins, hog
-      app_source LowCardinality(String),
-      -- An id for the app source.
-      -- Set app_source to avoid collision with ids from other app sources if the id generation is not safe.
-      -- Examples: A plugin id, a hog application id
-      app_source_id String,
-      -- A secondary id e.g. for the instance of app_source that generated this metric.
-      -- This may be ommitted if app_source is a singleton.
-      -- Examples: A plugin config id, a hog application config id
-      instance_id String,
-      metric_kind LowCardinality(String),
-      metric_name LowCardinality(String),
-      count SimpleAggregateFunction(sum, Int64)
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  , _partition UInt64
-  
-  )
-  ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_{shard}/posthog.sharded_app_metrics2', '{replica}')
-  PARTITION BY toYYYYMM(timestamp)
-  ORDER BY (team_id, app_source, app_source_id, instance_id, toStartOfHour(timestamp), metric_kind, metric_name)
-  
-  
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[sharded_app_metrics]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sharded_app_metrics ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      timestamp DateTime64(6, 'UTC'),
-      plugin_config_id Int64,
-      category LowCardinality(String),
-      job_id String,
-      successes SimpleAggregateFunction(sum, Int64),
-      successes_on_retry SimpleAggregateFunction(sum, Int64),
-      failures SimpleAggregateFunction(sum, Int64),
-      error_uuid UUID,
-      error_type String,
-      error_details String CODEC(ZSTD(3))
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  , _partition UInt64
-  
-  )
-  ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_{shard}/posthog.sharded_app_metrics', '{replica}')
-  PARTITION BY toYYYYMM(timestamp)
-  ORDER BY (team_id, plugin_config_id, job_id, category, toStartOfHour(timestamp), error_type, error_uuid)
-  
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[sharded_events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sharded_events ON CLUSTER 'posthog'
-  (
-      uuid UUID,
-      event VARCHAR,
-      properties VARCHAR CODEC(ZSTD(3)),
-      timestamp DateTime64(6, 'UTC'),
-      team_id Int64,
-      distinct_id VARCHAR,
-      elements_chain VARCHAR,
-      created_at DateTime64(6, 'UTC'),
-      person_id UUID,
-      person_created_at DateTime64,
-      person_properties VARCHAR Codec(ZSTD(3)),
-      group0_properties VARCHAR Codec(ZSTD(3)),
-      group1_properties VARCHAR Codec(ZSTD(3)),
-      group2_properties VARCHAR Codec(ZSTD(3)),
-      group3_properties VARCHAR Codec(ZSTD(3)),
-      group4_properties VARCHAR Codec(ZSTD(3)),
-      group0_created_at DateTime64,
-      group1_created_at DateTime64,
-      group2_created_at DateTime64,
-      group3_created_at DateTime64,
-      group4_created_at DateTime64,
-      person_mode Enum8('full' = 0, 'propertyless' = 1, 'force_upgrade' = 2)
-      
-      , $group_0 VARCHAR MATERIALIZED replaceRegexpAll(JSONExtractRaw(properties, '$group_0'), '^"|"$', '') COMMENT 'column_materializer::$group_0'
-      , $group_1 VARCHAR MATERIALIZED replaceRegexpAll(JSONExtractRaw(properties, '$group_1'), '^"|"$', '') COMMENT 'column_materializer::$group_1'
-      , $group_2 VARCHAR MATERIALIZED replaceRegexpAll(JSONExtractRaw(properties, '$group_2'), '^"|"$', '') COMMENT 'column_materializer::$group_2'
-      , $group_3 VARCHAR MATERIALIZED replaceRegexpAll(JSONExtractRaw(properties, '$group_3'), '^"|"$', '') COMMENT 'column_materializer::$group_3'
-      , $group_4 VARCHAR MATERIALIZED replaceRegexpAll(JSONExtractRaw(properties, '$group_4'), '^"|"$', '') COMMENT 'column_materializer::$group_4'
-      , $window_id VARCHAR MATERIALIZED replaceRegexpAll(JSONExtractRaw(properties, '$window_id'), '^"|"$', '') COMMENT 'column_materializer::$window_id'
-      , $session_id VARCHAR MATERIALIZED replaceRegexpAll(JSONExtractRaw(properties, '$session_id'), '^"|"$', '') COMMENT 'column_materializer::$session_id'
-      , elements_chain_href String MATERIALIZED extract(elements_chain, '(?::|")href="(.*?)"')
-      , elements_chain_texts Array(String) MATERIALIZED arrayDistinct(extractAll(elements_chain, '(?::|")text="(.*?)"'))
-      , elements_chain_ids Array(String) MATERIALIZED arrayDistinct(extractAll(elements_chain, '(?::|")attr_id="(.*?)"'))
-      , elements_chain_elements Array(Enum('a', 'button', 'form', 'input', 'select', 'textarea', 'label')) MATERIALIZED arrayDistinct(extractAll(elements_chain, '(?:^|;)(a|button|form|input|select|textarea|label)(?:\.|$|:)'))
-      , INDEX `minmax_$group_0` `$group_0` TYPE minmax GRANULARITY 1
-      , INDEX `minmax_$group_1` `$group_1` TYPE minmax GRANULARITY 1
-      , INDEX `minmax_$group_2` `$group_2` TYPE minmax GRANULARITY 1
-      , INDEX `minmax_$group_3` `$group_3` TYPE minmax GRANULARITY 1
-      , INDEX `minmax_$group_4` `$group_4` TYPE minmax GRANULARITY 1
-      , INDEX `minmax_$window_id` `$window_id` TYPE minmax GRANULARITY 1
-      , INDEX `minmax_$session_id` `$session_id` TYPE minmax GRANULARITY 1
-      ,                 properties_group_custom Map(String, String)
-                  MATERIALIZED mapSort(
-                      mapFilter((key, _) -> key NOT LIKE '$%' AND key NOT IN ('token', 'distinct_id', 'utm_source', 'utm_medium', 'utm_campaign', 'utm_content', 'utm_term', 'gclid', 'gad_source', 'gclsrc', 'dclid', 'gbraid', 'wbraid', 'fbclid', 'msclkid', 'twclid', 'li_fat_id', 'mc_cid', 'igshid', 'ttclid', 'rdt_cid'),
-                      CAST(JSONExtractKeysAndValues(properties, 'String'), 'Map(String, String)'))
-                  )
-                  CODEC(ZSTD(1))
-              , INDEX properties_group_custom_keys_bf mapKeys(properties_group_custom) TYPE bloom_filter, INDEX properties_group_custom_values_bf mapValues(properties_group_custom) TYPE bloom_filter,                 properties_group_feature_flags Map(String, String)
-                  MATERIALIZED mapSort(
-                      mapFilter((key, _) -> key like '$feature/%',
-                      CAST(JSONExtractKeysAndValues(properties, 'String'), 'Map(String, String)'))
-                  )
-                  CODEC(ZSTD(1))
-              , INDEX properties_group_feature_flags_keys_bf mapKeys(properties_group_feature_flags) TYPE bloom_filter, INDEX properties_group_feature_flags_values_bf mapValues(properties_group_feature_flags) TYPE bloom_filter
-  
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  , inserted_at Nullable(DateTime64(6, 'UTC')) DEFAULT NULL
-      
-      , INDEX kafka_timestamp_minmax_sharded_events _timestamp TYPE minmax GRANULARITY 3
-      
-  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_{shard}/posthog.events', '{replica}', _timestamp)
-  PARTITION BY toYYYYMM(timestamp)
-  ORDER BY (team_id, toDate(timestamp), event, cityHash64(distinct_id), cityHash64(uuid))
-  SAMPLE BY cityHash64(distinct_id)
-  SETTINGS storage_policy = 'hot_to_cold'
-  
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[sharded_heatmaps]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sharded_heatmaps ON CLUSTER 'posthog'
-  (
-      session_id VARCHAR,
-      team_id Int64,
-      distinct_id VARCHAR,
-      timestamp DateTime64(6, 'UTC'),
-      -- x is the x with resolution applied, the resolution converts high fidelity mouse positions into an NxN grid
-      x Int16,
-      -- y is the y with resolution applied, the resolution converts high fidelity mouse positions into an NxN grid
-      y Int16,
-      -- stored so that in future we can support other resolutions
-      scale_factor Int16,
-      viewport_width Int16,
-      viewport_height Int16,
-      -- some elements move when the page scrolls, others do not
-      pointer_target_fixed Bool,
-      current_url VARCHAR,
-      type LowCardinality(String),
-      _timestamp DateTime,
-      _offset UInt64,
-      _partition UInt64
-  ) ENGINE = ReplicatedMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_{shard}/posthog.heatmaps', '{replica}')
-  
-      PARTITION BY toYYYYMM(timestamp)
-      -- almost always this is being queried by
-      --   * type,
-      --   * team_id,
-      --   * date range,
-      --   * URL (maybe matching wild cards),
-      --   * width
-      -- we'll almost never query this by session id
-      -- so from least to most cardinality that's
-      ORDER BY (type, team_id,  toDate(timestamp), current_url, viewport_width)
-      
-  -- I am purposefully not setting index granularity
-  -- the default is 8192, and we will be loading a lot of data
-  -- per query, we tend to copy this 512 around the place but
-  -- i don't think it applies here
-  
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[sharded_ingestion_warnings]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sharded_ingestion_warnings ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      source LowCardinality(VARCHAR),
-      type VARCHAR,
-      details VARCHAR CODEC(ZSTD(3)),
-      timestamp DateTime64(6, 'UTC')
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  , _partition UInt64
-  
-  ) ENGINE = ReplicatedMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_{shard}/posthog.sharded_ingestion_warnings', '{replica}')
-  PARTITION BY toYYYYMMDD(timestamp)
-  ORDER BY (team_id, toHour(timestamp), type, source, timestamp)
-  
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[sharded_performance_events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sharded_performance_events ON CLUSTER 'posthog'
-  (
-      uuid UUID,
-  session_id String,
-  window_id String,
-  pageview_id String,
-  distinct_id String,
-  timestamp DateTime64,
-  time_origin DateTime64(3, 'UTC'),
-  entry_type LowCardinality(String),
-  name String,
-  team_id Int64,
-  current_url String,
-  start_time Float64,
-  duration Float64,
-  redirect_start Float64,
-  redirect_end Float64,
-  worker_start Float64,
-  fetch_start Float64,
-  domain_lookup_start Float64,
-  domain_lookup_end Float64,
-  connect_start Float64,
-  secure_connection_start Float64,
-  connect_end Float64,
-  request_start Float64,
-  response_start Float64,
-  response_end Float64,
-  decoded_body_size Int64,
-  encoded_body_size Int64,
-  initiator_type LowCardinality(String),
-  next_hop_protocol LowCardinality(String),
-  render_blocking_status LowCardinality(String),
-  response_status Int64,
-  transfer_size Int64,
-  largest_contentful_paint_element String,
-  largest_contentful_paint_render_time Float64,
-  largest_contentful_paint_load_time Float64,
-  largest_contentful_paint_size Float64,
-  largest_contentful_paint_id String,
-  largest_contentful_paint_url String,
-  dom_complete Float64,
-  dom_content_loaded_event Float64,
-  dom_interactive Float64,
-  load_event_end Float64,
-  load_event_start Float64,
-  redirect_count Int64,
-  navigation_type LowCardinality(String),
-  unload_event_end Float64,
-  unload_event_start Float64
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  , _partition UInt64
-  
-  ) ENGINE = ReplicatedMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_{shard}/posthog.performance_events', '{replica}')
-  PARTITION BY toYYYYMM(timestamp)
-  ORDER BY (team_id, toDate(timestamp), session_id, pageview_id, timestamp)
-  
-  SETTINGS storage_policy = 'hot_to_cold'
-  
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[sharded_raw_sessions]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sharded_raw_sessions ON CLUSTER 'posthog'
-  (
-      team_id Int64,
-      session_id_v7 UInt128, -- integer representation of a uuidv7
-  
-      -- ClickHouse will pick the latest value of distinct_id for the session
-      -- this is fine since even if the distinct_id changes during a session
-      distinct_id AggregateFunction(argMax, String, DateTime64(6, 'UTC')),
-  
-      min_timestamp SimpleAggregateFunction(min, DateTime64(6, 'UTC')),
-      max_timestamp SimpleAggregateFunction(max, DateTime64(6, 'UTC')),
-  
-      -- urls
-      urls SimpleAggregateFunction(groupUniqArrayArray, Array(String)),
-      entry_url AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      end_url AggregateFunction(argMax, String, DateTime64(6, 'UTC')),
-      last_external_click_url AggregateFunction(argMax, String, DateTime64(6, 'UTC')),
-  
-      -- device
-      initial_browser AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_browser_version AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_os AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_os_version AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_device_type AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_viewport_width AggregateFunction(argMin, Int64, DateTime64(6, 'UTC')),
-      initial_viewport_height AggregateFunction(argMin, Int64, DateTime64(6, 'UTC')),
-  
-      -- geoip
-      -- only store the properties we actually use, as there's tons, see https://posthog.com/docs/cdp/geoip-enrichment
-      initial_geoip_country_code AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_geoip_subdivision_1_code AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_geoip_subdivision_1_name AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_geoip_subdivision_city_name AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_geoip_time_zone AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-  
-      -- attribution
-      initial_referring_domain AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_source AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_campaign AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_medium AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_term AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_content AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gad_source AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gclsrc AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_dclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gbraid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_wbraid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_fbclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_msclkid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_twclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_li_fat_id AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_mc_cid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_igshid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_ttclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-  
-      -- Count pageview, autocapture, and screen events for providing totals.
-      -- It's unclear if we can use the counts as they are not idempotent, and we had a bug on EU where events were
-      -- double-counted, so the counts were wrong. To get around this, also keep track of the unique uuids. This will be
-      -- slower and more expensive to store, but will be correct even if events are double-counted, so can be used to
-      -- verify correctness and as a backup. Ideally we will be able to delete the uniq columns in the future when we're
-      -- satisfied that counts are accurate.
-      pageview_count SimpleAggregateFunction(sum, Int64),
-      pageview_uniq AggregateFunction(uniq, Nullable(UUID)),
-      autocapture_count SimpleAggregateFunction(sum, Int64),
-      autocapture_uniq AggregateFunction(uniq, Nullable(UUID)),
-      screen_count SimpleAggregateFunction(sum, Int64),
-      screen_uniq AggregateFunction(uniq, Nullable(UUID)),
-  
-      -- replay
-      maybe_has_session_replay SimpleAggregateFunction(max, Bool), -- will be written False to by the events table mv and True to by the replay table mv
-  
-      -- as a performance optimisation, also keep track of the uniq events for all of these combined, a bounce is a session with <2 of these
-      page_screen_autocapture_uniq_up_to AggregateFunction(uniqUpTo(1), Nullable(UUID)),
-  
-      -- web vitals
-      vitals_lcp AggregateFunction(argMin, Nullable(Float64), DateTime64(6, 'UTC'))
-  ) ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_{shard}/posthog.raw_sessions', '{replica}')
-  
-  PARTITION BY toYYYYMM(fromUnixTimestamp(intDiv(toUInt64(bitShiftRight(session_id_v7, 80)), 1000)))
-  ORDER BY (
-      team_id,
-      toStartOfHour(fromUnixTimestamp(intDiv(toUInt64(bitShiftRight(session_id_v7, 80)), 1000))),
-      cityHash64(session_id_v7),
-      session_id_v7
-  )
-  SAMPLE BY cityHash64(session_id_v7)
-  
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[sharded_session_recording_events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sharded_session_recording_events ON CLUSTER 'posthog'
-  (
-      uuid UUID,
-      timestamp DateTime64(6, 'UTC'),
-      team_id Int64,
-      distinct_id VARCHAR,
-      session_id VARCHAR,
-      window_id VARCHAR,
-      snapshot_data VARCHAR,
-      created_at DateTime64(6, 'UTC')
-      , has_full_snapshot Int8 MATERIALIZED JSONExtractBool(snapshot_data, 'has_full_snapshot'), events_summary Array(String) MATERIALIZED JSONExtract(JSON_QUERY(snapshot_data, '$.events_summary[*]'), 'Array(String)'), click_count Int8 MATERIALIZED length(arrayFilter((x) -> JSONExtractInt(x, 'type') = 3 AND JSONExtractInt(x, 'data', 'source') = 2, events_summary)), keypress_count Int8 MATERIALIZED length(arrayFilter((x) -> JSONExtractInt(x, 'type') = 3 AND JSONExtractInt(x, 'data', 'source') = 5, events_summary)), timestamps_summary Array(DateTime64(6, 'UTC')) MATERIALIZED arraySort(arrayMap((x) -> toDateTime(JSONExtractInt(x, 'timestamp') / 1000), events_summary)), first_event_timestamp Nullable(DateTime64(6, 'UTC')) MATERIALIZED if(empty(timestamps_summary), NULL, arrayReduce('min', timestamps_summary)), last_event_timestamp Nullable(DateTime64(6, 'UTC')) MATERIALIZED if(empty(timestamps_summary), NULL, arrayReduce('max', timestamps_summary)), urls Array(String) MATERIALIZED arrayFilter(x -> x != '', arrayMap((x) -> JSONExtractString(x, 'data', 'href'), events_summary))
-      
-      
-  , _timestamp DateTime
-  , _offset UInt64
-  
-      , INDEX kafka_timestamp_minmax_sharded_session_recording_events _timestamp TYPE minmax GRANULARITY 3
-      
-  ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_{shard}/posthog.session_recording_events', '{replica}', _timestamp)
-  PARTITION BY toYYYYMMDD(timestamp)
-  ORDER BY (team_id, toHour(timestamp), session_id, timestamp, uuid)
-  
-  SETTINGS index_granularity=512
-  
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[sharded_session_replay_events]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sharded_session_replay_events ON CLUSTER 'posthog'
-  (
-      -- part of order by so will aggregate correctly
-      session_id VARCHAR,
-      -- part of order by so will aggregate correctly
-      team_id Int64,
-      -- ClickHouse will pick any value of distinct_id for the session
-      -- this is fine since even if the distinct_id changes during a session
-      -- it will still (or should still) map to the same person
-      distinct_id VARCHAR,
-      min_first_timestamp SimpleAggregateFunction(min, DateTime64(6, 'UTC')),
-      max_last_timestamp SimpleAggregateFunction(max, DateTime64(6, 'UTC')),
-      first_url AggregateFunction(argMin, Nullable(VARCHAR), DateTime64(6, 'UTC')),
-      click_count SimpleAggregateFunction(sum, Int64),
-      keypress_count SimpleAggregateFunction(sum, Int64),
-      mouse_activity_count SimpleAggregateFunction(sum, Int64),
-      active_milliseconds SimpleAggregateFunction(sum, Int64),
-      console_log_count SimpleAggregateFunction(sum, Int64),
-      console_warn_count SimpleAggregateFunction(sum, Int64),
-      console_error_count SimpleAggregateFunction(sum, Int64),
-      -- this column allows us to estimate the amount of data that is being ingested
-      size SimpleAggregateFunction(sum, Int64),
-      -- this allows us to count the number of messages received in a session
-      -- often very useful in incidents or debugging
-      message_count SimpleAggregateFunction(sum, Int64),
-      -- this allows us to count the number of snapshot events received in a session
-      -- often very useful in incidents or debugging
-      -- because we batch events we expect message_count to be lower than event_count
-      event_count SimpleAggregateFunction(sum, Int64),
-      -- which source the snapshots came from Android, iOS, Mobile, Web. Web if absent
-      snapshot_source AggregateFunction(argMin, LowCardinality(Nullable(String)), DateTime64(6, 'UTC')),
-      _timestamp SimpleAggregateFunction(max, DateTime)
-  ) ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_{shard}/posthog.session_replay_events', '{replica}')
-  
-      PARTITION BY toYYYYMM(min_first_timestamp)
-      -- order by is used by the aggregating merge tree engine to
-      -- identify candidates to merge, e.g. toDate(min_first_timestamp)
-      -- would mean we would have one row per day per session_id
-      -- if CH could completely merge to match the order by
-      -- it is also used to organise data to make queries faster
-      -- we want the fewest rows possible but also the fastest queries
-      -- since we query by date and not by time
-      -- and order by must be in order of increasing cardinality
-      -- so we order by date first, then team_id, then session_id
-      -- hopefully, this is a good balance between the two
-      ORDER BY (toDate(min_first_timestamp), team_id, session_id)
-  SETTINGS index_granularity=512
-  
-  '''
-# ---
-# name: test_create_table_query_replicated_and_storage[sharded_sessions]
-  '''
-  
-  CREATE TABLE IF NOT EXISTS sharded_sessions ON CLUSTER 'posthog'
-  (
-      -- part of order by so will aggregate correctly
-      session_id VARCHAR,
-      -- part of order by so will aggregate correctly
-      team_id Int64,
-      -- ClickHouse will pick any value of distinct_id for the session
-      -- this is fine since even if the distinct_id changes during a session
-      -- it will still (or should still) map to the same person
-      distinct_id SimpleAggregateFunction(any, String),
-  
-      min_timestamp SimpleAggregateFunction(min, DateTime64(6, 'UTC')),
-      max_timestamp SimpleAggregateFunction(max, DateTime64(6, 'UTC')),
-  
-      urls SimpleAggregateFunction(groupUniqArrayArray, Array(String)),
-      entry_url AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      exit_url AggregateFunction(argMax, String, DateTime64(6, 'UTC')),
-  
-      initial_referring_domain AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_source AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_campaign AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_medium AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_term AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_utm_content AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gad_source AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gclsrc AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_dclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_gbraid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_wbraid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_fbclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_msclkid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_twclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_li_fat_id AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_mc_cid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_igshid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-      initial_ttclid AggregateFunction(argMin, String, DateTime64(6, 'UTC')),
-  
-      -- create a map of how many times we saw each event
-      event_count_map SimpleAggregateFunction(sumMap, Map(String, Int64)),
-      -- duplicate the event count as a specific column for pageviews and autocaptures,
-      -- as these are used in some key queries and need to be fast
-      pageview_count SimpleAggregateFunction(sum, Int64),
-      autocapture_count SimpleAggregateFunction(sum, Int64),
-  ) ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/tables/77f1df52-4b43-11e9-910f-b8ca3a9b9f3e_{shard}/posthog.sessions', '{replica}')
-  
-      PARTITION BY toYYYYMM(min_timestamp)
-      -- order by is used by the aggregating merge tree engine to
-      -- identify candidates to merge, e.g. toDate(min_timestamp)
-      -- would mean we would have one row per day per session_id
-      -- if CH could completely merge to match the order by
-      -- it is also used to organise data to make queries faster
-      -- we want the fewest rows possible but also the fastest queries
-      -- since we query by date and not by time
-      -- and order by must be in order of increasing cardinality
-      -- so we order by date first, then team_id, then session_id
-      -- hopefully, this is a good balance between the two
-      ORDER BY (toStartOfDay(min_timestamp), team_id, session_id)
-  SETTINGS index_granularity=512
-  
-  '''
-# ---
diff --git a/posthog/hogql/database/schema/test/__snapshots__/test_session_replay_events.ambr b/posthog/hogql/database/schema/test/__snapshots__/test_session_replay_events.ambr
index aa990fe2c7b66..5f61e523b8db2 100644
--- a/posthog/hogql/database/schema/test/__snapshots__/test_session_replay_events.ambr
+++ b/posthog/hogql/database/schema/test/__snapshots__/test_session_replay_events.ambr
@@ -112,24 +112,6 @@
                      max_bytes_before_external_group_by=0
   '''
 # ---
-# name: TestFilterSessionReplaysByEvents.test_select_by_subquery_on_event_property_with_time_filter_and_without_join
-  '''
-  SELECT DISTINCT session_replay_events.session_id AS session_id
-  FROM session_replay_events
-  WHERE and(equals(session_replay_events.team_id, 2), in(session_replay_events.session_id,
-                                                           (SELECT events.`$session_id` AS `$session_id`
-                                                            FROM events
-                                                            WHERE and(equals(events.team_id, 2), ifNull(like(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(events.properties, '$current_url'), ''), 'null'), '^"|"$', ''), '%example.com%'), 0)))), ifNull(greaterOrEquals(toTimeZone(session_replay_events.min_first_timestamp, 'UTC'), toDateOrNull('2020-01-01')), 0))
-  ORDER BY session_replay_events.session_id ASC
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
 # name: TestFilterSessionReplaysByEvents.test_select_by_subquery_on_event_property_without_join
   '''
   SELECT DISTINCT session_replay_events.session_id AS session_id
diff --git a/posthog/hogql/transforms/test/__snapshots__/test_in_cohort.ambr b/posthog/hogql/transforms/test/__snapshots__/test_in_cohort.ambr
index 014a0ad353f9b..7fdb214aa01c5 100644
--- a/posthog/hogql/transforms/test/__snapshots__/test_in_cohort.ambr
+++ b/posthog/hogql/transforms/test/__snapshots__/test_in_cohort.ambr
@@ -31,7 +31,7 @@
   FROM events LEFT JOIN (
   SELECT person_static_cohort.person_id AS cohort_person_id, 1 AS matched, person_static_cohort.cohort_id AS cohort_id 
   FROM person_static_cohort 
-  WHERE and(equals(person_static_cohort.team_id, 420), in(person_static_cohort.cohort_id, [236]))) AS __in_cohort ON equals(__in_cohort.cohort_person_id, events.person_id) 
+  WHERE and(equals(person_static_cohort.team_id, 420), in(person_static_cohort.cohort_id, [516]))) AS __in_cohort ON equals(__in_cohort.cohort_person_id, events.person_id) 
   WHERE and(equals(events.team_id, 420), 1, ifNull(equals(__in_cohort.matched, 1), 0)) 
   LIMIT 100 
   SETTINGS readonly=2, max_execution_time=60, allow_experimental_object_type=1, format_csv_allow_double_quotes=0, max_ast_elements=4000000, max_expanded_ast_elements=4000000, max_bytes_before_external_group_by=0
@@ -42,7 +42,7 @@
   FROM events LEFT JOIN (
   SELECT person_id AS cohort_person_id, 1 AS matched, cohort_id 
   FROM static_cohort_people 
-  WHERE in(cohort_id, [236])) AS __in_cohort ON equals(__in_cohort.cohort_person_id, person_id) 
+  WHERE in(cohort_id, [516])) AS __in_cohort ON equals(__in_cohort.cohort_person_id, person_id) 
   WHERE and(1, equals(__in_cohort.matched, 1)) 
   LIMIT 100
   '''
@@ -55,7 +55,7 @@
   FROM events LEFT JOIN (
   SELECT person_static_cohort.person_id AS cohort_person_id, 1 AS matched, person_static_cohort.cohort_id AS cohort_id 
   FROM person_static_cohort 
-  WHERE and(equals(person_static_cohort.team_id, 420), in(person_static_cohort.cohort_id, [237]))) AS __in_cohort ON equals(__in_cohort.cohort_person_id, events.person_id) 
+  WHERE and(equals(person_static_cohort.team_id, 420), in(person_static_cohort.cohort_id, [517]))) AS __in_cohort ON equals(__in_cohort.cohort_person_id, events.person_id) 
   WHERE and(equals(events.team_id, 420), 1, ifNull(equals(__in_cohort.matched, 1), 0)) 
   LIMIT 100 
   SETTINGS readonly=2, max_execution_time=60, allow_experimental_object_type=1, format_csv_allow_double_quotes=0, max_ast_elements=4000000, max_expanded_ast_elements=4000000, max_bytes_before_external_group_by=0
@@ -66,7 +66,7 @@
   FROM events LEFT JOIN (
   SELECT person_id AS cohort_person_id, 1 AS matched, cohort_id 
   FROM static_cohort_people 
-  WHERE in(cohort_id, [237])) AS __in_cohort ON equals(__in_cohort.cohort_person_id, person_id) 
+  WHERE in(cohort_id, [517])) AS __in_cohort ON equals(__in_cohort.cohort_person_id, person_id) 
   WHERE and(1, equals(__in_cohort.matched, 1)) 
   LIMIT 100
   '''
diff --git a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel.ambr b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel.ambr
index 38ddd0ce72f70..a574e61a3243d 100644
--- a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel.ambr
+++ b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel.ambr
@@ -1850,9 +1850,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   WHERE steps IN [1, 2, 3]
     AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
   ORDER BY aggregation_target
@@ -1994,9 +1993,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   WHERE steps IN [2, 3]
     AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
   ORDER BY aggregation_target
@@ -2138,9 +2136,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   WHERE steps IN [1, 2, 3]
     AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
   ORDER BY aggregation_target
@@ -2282,9 +2279,8 @@
            WHERE step_0 = 1 ))
      GROUP BY aggregation_target,
               steps,
-              max_steps,
               prop
-     HAVING steps = max_steps)
+     HAVING steps = max(max_steps))
   WHERE steps IN [2, 3]
     AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
   ORDER BY aggregation_target
diff --git a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_correlation_actors_udf.ambr b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_correlation_actors_udf.ambr
index 03873495f6f0c..fda22ad532ce2 100644
--- a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_correlation_actors_udf.ambr
+++ b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_correlation_actors_udf.ambr
@@ -373,316 +373,3 @@
                      max_bytes_before_external_group_by=0
   '''
 # ---
-# name: TestFunnelCorrelationsActorsUDF.test_strict_funnel_correlation_with_recordings
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_1_conversion_times)])[1] AS step_1_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_1_conversion_times)])[1] AS step_1_median_conversion_time,
-         groupArray(row_number) AS row_number,
-         final_prop AS final_prop
-  FROM
-    (SELECT countIf(ifNull(ifNull(equals(step_reached, 0), 0), 0)) AS step_1,
-            countIf(ifNull(ifNull(equals(step_reached, 1), 0), 0)) AS step_2,
-            groupArrayIf(timings[1], ifNull(greater(timings[1], 0), 0)) AS step_1_conversion_times,
-            rowNumberInBlock() AS row_number,
-            breakdown AS final_prop
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array_v0(2, 1209600, 'first_touch', 'strict', [[]], arrayFilter((x, x2) -> not(and(empty(x.4), empty(x2.4), ifNull(equals(x.3, x2.3), isNull(x.3)
-                                                                                                                                                             and isNull(x2.3)), ifNull(greater(x.1, x2.1), 0))), events_array, arrayRotateRight(events_array, 1)))) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                  if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(equals(e.event, '$pageview'), 1, 0) AS step_0,
-                  if(equals(e.event, 'insight analyzed'), 1, 0) AS step_1
-           FROM events AS e
-           LEFT OUTER JOIN
-             (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                     person_distinct_id_overrides.distinct_id AS distinct_id
-              FROM person_distinct_id_overrides
-              WHERE equals(person_distinct_id_overrides.team_id, 2)
-              GROUP BY person_distinct_id_overrides.distinct_id
-              HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-           WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-08 23:59:59.999999', 6, 'UTC')))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     GROUP BY breakdown
-     ORDER BY step_2 DESC, step_1 DESC)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelCorrelationsActorsUDF.test_strict_funnel_correlation_with_recordings.1
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         source.matching_events AS matching_events
-  FROM
-    (SELECT funnel_actors.actor_id AS actor_id,
-            any(funnel_actors.matching_events) AS matching_events
-     FROM
-       (SELECT aggregation_target AS actor_id,
-               matched_events_array[plus(step_reached, 1)] AS matching_events,
-               (matched_events_array[1][1]).1 AS timestamp,
-               nullIf((matched_events_array[2][1]).1, 0) AS final_timestamp,
-               (matched_events_array[1][1]).1 AS first_timestamp,
-               steps AS steps,
-               final_timestamp,
-               first_timestamp
-        FROM
-          (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-                  arrayJoin(aggregate_funnel_array_v0(2, 1209600, 'first_touch', 'strict', [[]], arrayFilter((x, x2) -> not(and(empty(x.4), empty(x2.4), ifNull(equals(x.3, x2.3), isNull(x.3)
-                                                                                                                                                                and isNull(x2.3)), ifNull(greater(x.1, x2.1), 0))), events_array, arrayRotateRight(events_array, 1)))) AS af_tuple,
-                  af_tuple.1 AS step_reached,
-                  plus(af_tuple.1, 1) AS steps,
-                  af_tuple.2 AS breakdown,
-                  af_tuple.3 AS timings,
-                  af_tuple.4 AS matched_event_uuids_array_array,
-                  groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-                  mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-                  arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-                  aggregation_target AS aggregation_target
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, '$pageview'), 1, 0) AS step_0,
-                     if(equals(e.event, 'insight analyzed'), 1, 0) AS step_1
-              FROM events AS e
-              LEFT OUTER JOIN
-                (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                        person_distinct_id_overrides.distinct_id AS distinct_id
-                 FROM person_distinct_id_overrides
-                 WHERE equals(person_distinct_id_overrides.team_id, 2)
-                 GROUP BY person_distinct_id_overrides.distinct_id
-                 HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-              LEFT JOIN
-                (SELECT person.id AS id,
-                        replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(person.properties, 'foo'), ''), 'null'), '^"|"$', '') AS properties___foo
-                 FROM person
-                 WHERE and(equals(person.team_id, 2), ifNull(in(tuple(person.id, person.version),
-                                                                  (SELECT person.id AS id, max(person.version) AS version
-                                                                   FROM person
-                                                                   WHERE equals(person.team_id, 2)
-                                                                   GROUP BY person.id
-                                                                   HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)))), 0)) SETTINGS optimize_aggregation_in_order=1) AS e__person ON equals(if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id), e__person.id)
-              WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-08 23:59:59.999999', 6, 'UTC'))), ifNull(equals(e__person.properties___foo, 'bar'), 0)))
-           GROUP BY aggregation_target
-           HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-        WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-        ORDER BY aggregation_target ASC) AS funnel_actors
-     WHERE ifNull(equals(funnel_actors.steps, 2), 0)
-     GROUP BY funnel_actors.actor_id
-     ORDER BY funnel_actors.actor_id ASC) AS source
-  INNER JOIN
-    (SELECT person.id AS id
-     FROM person
-     WHERE and(equals(person.team_id, 2), in(id,
-                                               (SELECT source.actor_id AS actor_id
-                                                FROM
-                                                  (SELECT funnel_actors.actor_id AS actor_id, any(funnel_actors.matching_events) AS matching_events
-                                                   FROM
-                                                     (SELECT aggregation_target AS actor_id, matched_events_array[plus(step_reached, 1)] AS matching_events, (matched_events_array[1][1]).1 AS timestamp, nullIf((matched_events_array[2][1]).1, 0) AS final_timestamp, (matched_events_array[1][1]).1 AS first_timestamp, steps AS steps, final_timestamp, first_timestamp
-                                                      FROM
-                                                        (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array, arrayJoin(aggregate_funnel_array_v0(2, 1209600, 'first_touch', 'strict', [[]], arrayFilter((x, x2) -> not(and(empty(x.4), empty(x2.4), ifNull(equals(x.3, x2.3), isNull(x.3)
-                                                                                                                                                                                                                                                                                                                                                                                                                    and isNull(x2.3)), ifNull(greater(x.1, x2.1), 0))), events_array, arrayRotateRight(events_array, 1)))) AS af_tuple, af_tuple.1 AS step_reached, plus(af_tuple.1, 1) AS steps, af_tuple.2 AS breakdown, af_tuple.3 AS timings, af_tuple.4 AS matched_event_uuids_array_array, groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events, mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map, arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array, aggregation_target AS aggregation_target
-                                                         FROM
-                                                           (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, e.uuid AS uuid, e.`$session_id` AS `$session_id`, e.`$window_id` AS `$window_id`, if(equals(e.event, '$pageview'), 1, 0) AS step_0, if(equals(e.event, 'insight analyzed'), 1, 0) AS step_1
-                                                            FROM events AS e
-                                                            LEFT OUTER JOIN
-                                                              (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                               FROM person_distinct_id_overrides
-                                                               WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                               GROUP BY person_distinct_id_overrides.distinct_id
-                                                               HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                            LEFT JOIN
-                                                              (SELECT person.id AS id, replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(person.properties, 'foo'), ''), 'null'), '^"|"$', '') AS properties___foo
-                                                               FROM person
-                                                               WHERE and(equals(person.team_id, 2), ifNull(in(tuple(person.id, person.version),
-                                                                                                                (SELECT person.id AS id, max(person.version) AS version
-                                                                                                                 FROM person
-                                                                                                                 WHERE equals(person.team_id, 2)
-                                                                                                                 GROUP BY person.id
-                                                                                                                 HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)))), 0)) SETTINGS optimize_aggregation_in_order=1) AS e__person ON equals(if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id), e__person.id)
-                                                            WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-08 23:59:59.999999', 6, 'UTC'))), ifNull(equals(e__person.properties___foo, 'bar'), 0)))
-                                                         GROUP BY aggregation_target
-                                                         HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-                                                      WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-                                                      ORDER BY aggregation_target ASC) AS funnel_actors
-                                                   WHERE ifNull(equals(funnel_actors.steps, 2), 0)
-                                                   GROUP BY funnel_actors.actor_id
-                                                   ORDER BY funnel_actors.actor_id ASC) AS source)))
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestFunnelCorrelationsActorsUDF.test_strict_funnel_correlation_with_recordings.2
-  '''
-  SELECT DISTINCT session_replay_events.session_id AS session_id
-  FROM session_replay_events
-  WHERE and(equals(session_replay_events.team_id, 2), ifNull(greaterOrEquals(toTimeZone(session_replay_events.min_first_timestamp, 'UTC'), minus(toDateTime64('2021-01-02 00:00:00.000000', 6, 'UTC'), toIntervalDay(21))), 0), in(session_replay_events.session_id, ['s2']))
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestFunnelCorrelationsActorsUDF.test_strict_funnel_correlation_with_recordings.3
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         source.matching_events AS matching_events
-  FROM
-    (SELECT funnel_actors.actor_id AS actor_id,
-            any(funnel_actors.matching_events) AS matching_events
-     FROM
-       (SELECT aggregation_target AS actor_id,
-               matched_events_array[plus(step_reached, 1)] AS matching_events,
-               (matched_events_array[1][1]).1 AS timestamp,
-               nullIf((matched_events_array[2][1]).1, 0) AS final_timestamp,
-               (matched_events_array[1][1]).1 AS first_timestamp,
-               steps AS steps,
-               final_timestamp,
-               first_timestamp
-        FROM
-          (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-                  arrayJoin(aggregate_funnel_array_v0(2, 1209600, 'first_touch', 'strict', [[]], arrayFilter((x, x2) -> not(and(empty(x.4), empty(x2.4), ifNull(equals(x.3, x2.3), isNull(x.3)
-                                                                                                                                                                and isNull(x2.3)), ifNull(greater(x.1, x2.1), 0))), events_array, arrayRotateRight(events_array, 1)))) AS af_tuple,
-                  af_tuple.1 AS step_reached,
-                  plus(af_tuple.1, 1) AS steps,
-                  af_tuple.2 AS breakdown,
-                  af_tuple.3 AS timings,
-                  af_tuple.4 AS matched_event_uuids_array_array,
-                  groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-                  mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-                  arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-                  aggregation_target AS aggregation_target
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, '$pageview'), 1, 0) AS step_0,
-                     if(equals(e.event, 'insight analyzed'), 1, 0) AS step_1
-              FROM events AS e
-              LEFT OUTER JOIN
-                (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                        person_distinct_id_overrides.distinct_id AS distinct_id
-                 FROM person_distinct_id_overrides
-                 WHERE equals(person_distinct_id_overrides.team_id, 2)
-                 GROUP BY person_distinct_id_overrides.distinct_id
-                 HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-              LEFT JOIN
-                (SELECT person.id AS id,
-                        replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(person.properties, 'foo'), ''), 'null'), '^"|"$', '') AS properties___foo
-                 FROM person
-                 WHERE and(equals(person.team_id, 2), ifNull(in(tuple(person.id, person.version),
-                                                                  (SELECT person.id AS id, max(person.version) AS version
-                                                                   FROM person
-                                                                   WHERE equals(person.team_id, 2)
-                                                                   GROUP BY person.id
-                                                                   HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)))), 0)) SETTINGS optimize_aggregation_in_order=1) AS e__person ON equals(if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id), e__person.id)
-              WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-08 23:59:59.999999', 6, 'UTC'))), ifNull(equals(e__person.properties___foo, 'bar'), 0)))
-           GROUP BY aggregation_target
-           HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-        WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-        ORDER BY aggregation_target ASC) AS funnel_actors
-     WHERE ifNull(notEquals(funnel_actors.steps, 2), 1)
-     GROUP BY funnel_actors.actor_id
-     ORDER BY funnel_actors.actor_id ASC) AS source
-  INNER JOIN
-    (SELECT person.id AS id
-     FROM person
-     WHERE and(equals(person.team_id, 2), in(id,
-                                               (SELECT source.actor_id AS actor_id
-                                                FROM
-                                                  (SELECT funnel_actors.actor_id AS actor_id, any(funnel_actors.matching_events) AS matching_events
-                                                   FROM
-                                                     (SELECT aggregation_target AS actor_id, matched_events_array[plus(step_reached, 1)] AS matching_events, (matched_events_array[1][1]).1 AS timestamp, nullIf((matched_events_array[2][1]).1, 0) AS final_timestamp, (matched_events_array[1][1]).1 AS first_timestamp, steps AS steps, final_timestamp, first_timestamp
-                                                      FROM
-                                                        (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array, arrayJoin(aggregate_funnel_array_v0(2, 1209600, 'first_touch', 'strict', [[]], arrayFilter((x, x2) -> not(and(empty(x.4), empty(x2.4), ifNull(equals(x.3, x2.3), isNull(x.3)
-                                                                                                                                                                                                                                                                                                                                                                                                                    and isNull(x2.3)), ifNull(greater(x.1, x2.1), 0))), events_array, arrayRotateRight(events_array, 1)))) AS af_tuple, af_tuple.1 AS step_reached, plus(af_tuple.1, 1) AS steps, af_tuple.2 AS breakdown, af_tuple.3 AS timings, af_tuple.4 AS matched_event_uuids_array_array, groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events, mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map, arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array, aggregation_target AS aggregation_target
-                                                         FROM
-                                                           (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, e.uuid AS uuid, e.`$session_id` AS `$session_id`, e.`$window_id` AS `$window_id`, if(equals(e.event, '$pageview'), 1, 0) AS step_0, if(equals(e.event, 'insight analyzed'), 1, 0) AS step_1
-                                                            FROM events AS e
-                                                            LEFT OUTER JOIN
-                                                              (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                               FROM person_distinct_id_overrides
-                                                               WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                               GROUP BY person_distinct_id_overrides.distinct_id
-                                                               HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                            LEFT JOIN
-                                                              (SELECT person.id AS id, replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(person.properties, 'foo'), ''), 'null'), '^"|"$', '') AS properties___foo
-                                                               FROM person
-                                                               WHERE and(equals(person.team_id, 2), ifNull(in(tuple(person.id, person.version),
-                                                                                                                (SELECT person.id AS id, max(person.version) AS version
-                                                                                                                 FROM person
-                                                                                                                 WHERE equals(person.team_id, 2)
-                                                                                                                 GROUP BY person.id
-                                                                                                                 HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)))), 0)) SETTINGS optimize_aggregation_in_order=1) AS e__person ON equals(if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id), e__person.id)
-                                                            WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-08 23:59:59.999999', 6, 'UTC'))), ifNull(equals(e__person.properties___foo, 'bar'), 0)))
-                                                         GROUP BY aggregation_target
-                                                         HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-                                                      WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-                                                      ORDER BY aggregation_target ASC) AS funnel_actors
-                                                   WHERE ifNull(notEquals(funnel_actors.steps, 2), 1)
-                                                   GROUP BY funnel_actors.actor_id
-                                                   ORDER BY funnel_actors.actor_id ASC) AS source)))
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestFunnelCorrelationsActorsUDF.test_strict_funnel_correlation_with_recordings.4
-  '''
-  SELECT DISTINCT session_replay_events.session_id AS session_id
-  FROM session_replay_events
-  WHERE and(equals(session_replay_events.team_id, 2), ifNull(greaterOrEquals(toTimeZone(session_replay_events.min_first_timestamp, 'UTC'), minus(toDateTime64('2021-01-02 00:00:00.000000', 6, 'UTC'), toIntervalDay(21))), 0), in(session_replay_events.session_id, ['s3']))
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
diff --git a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_correlation_udf.ambr b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_correlation_udf.ambr
index 6de655c4d3331..cc2122217e206 100644
--- a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_correlation_udf.ambr
+++ b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_correlation_udf.ambr
@@ -4178,983 +4178,3 @@
                      max_bytes_before_external_group_by=0
   '''
 # ---
-# name: TestClickhouseFunnelCorrelationUDF.test_funnel_correlation_with_properties_and_groups_person_on_events_materialized
-  '''
-  SELECT concat(ifNull(toString((aggregation_target_with_props.prop).1), ''), '::', ifNull(toString((aggregation_target_with_props.prop).2), '')) AS name,
-         countDistinctIf(aggregation_target_with_props.actor_id, ifNull(equals(aggregation_target_with_props.steps, 2), 0)) AS success_count,
-         countDistinctIf(aggregation_target_with_props.actor_id, ifNull(notEquals(aggregation_target_with_props.steps, 2), 1)) AS failure_count
-  FROM
-    (SELECT funnel_actors.actor_id AS actor_id,
-            funnel_actors.steps AS steps,
-            arrayJoin(arrayZip(['industry'], [JSONExtractString(groups_0.properties, 'industry')])) AS prop
-     FROM
-       (SELECT aggregation_target AS actor_id,
-               (matched_events_array[1][1]).1 AS timestamp,
-               nullIf((matched_events_array[2][1]).1, 0) AS final_timestamp,
-               (matched_events_array[1][1]).1 AS first_timestamp,
-               steps AS steps,
-               final_timestamp,
-               first_timestamp
-        FROM
-          (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-                  arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-                  af_tuple.1 AS step_reached,
-                  plus(af_tuple.1, 1) AS steps,
-                  af_tuple.2 AS breakdown,
-                  af_tuple.3 AS timings,
-                  af_tuple.4 AS matched_event_uuids_array_array,
-                  groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-                  mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-                  arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-                  aggregation_target AS aggregation_target
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     e.`$group_0` AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                     if(equals(e.event, 'paid'), 1, 0) AS step_1
-              FROM events AS e
-              WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))
-           GROUP BY aggregation_target
-           HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-        WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-        ORDER BY aggregation_target ASC) AS funnel_actors
-     LEFT JOIN
-       (SELECT groups.key AS key,
-               groups.properties AS properties
-        FROM
-          (SELECT argMax(groups.group_properties, toTimeZone(groups._timestamp, 'UTC')) AS properties,
-                  groups.group_type_index AS index,
-                  groups.group_key AS key
-           FROM groups
-           WHERE equals(groups.team_id, 2)
-           GROUP BY groups.group_type_index,
-                    groups.group_key) AS groups
-        WHERE ifNull(equals(groups.index, 0), 0)) AS groups_0 ON equals(funnel_actors.actor_id, groups_0.key)) AS aggregation_target_with_props
-  GROUP BY (aggregation_target_with_props.prop).1, (aggregation_target_with_props.prop).2
-  HAVING ifNull(notIn((aggregation_target_with_props.prop).1, []), 0)
-  LIMIT 100
-  UNION ALL
-  SELECT 'Total_Values_In_Query' AS name,
-         countDistinctIf(funnel_actors.actor_id, ifNull(equals(funnel_actors.steps, 2), 0)) AS success_count,
-         countDistinctIf(funnel_actors.actor_id, ifNull(notEquals(funnel_actors.steps, 2), 1)) AS failure_count
-  FROM
-    (SELECT aggregation_target AS actor_id,
-            (matched_events_array[1][1]).1 AS timestamp,
-            nullIf((matched_events_array[2][1]).1, 0) AS final_timestamp,
-            (matched_events_array[1][1]).1 AS first_timestamp,
-            steps AS steps,
-            final_timestamp,
-            first_timestamp
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               af_tuple.4 AS matched_event_uuids_array_array,
-               groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-               mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-               arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                  e.`$group_0` AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                  if(equals(e.event, 'paid'), 1, 0) AS step_1
-           FROM events AS e
-           WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-     ORDER BY aggregation_target ASC) AS funnel_actors
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestClickhouseFunnelCorrelationUDF.test_funnel_correlation_with_properties_and_groups_person_on_events_materialized.1
-  '''
-  SELECT source.actor_id AS actor_id
-  FROM
-    (SELECT funnel_actors.actor_id AS actor_id,
-            any(funnel_actors.matching_events) AS matching_events
-     FROM
-       (SELECT aggregation_target AS actor_id,
-               matched_events_array[plus(step_reached, 1)] AS matching_events,
-               (matched_events_array[1][1]).1 AS timestamp,
-               nullIf((matched_events_array[2][1]).1, 0) AS final_timestamp,
-               (matched_events_array[1][1]).1 AS first_timestamp,
-               steps AS steps,
-               final_timestamp,
-               first_timestamp
-        FROM
-          (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-                  arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-                  af_tuple.1 AS step_reached,
-                  plus(af_tuple.1, 1) AS steps,
-                  af_tuple.2 AS breakdown,
-                  af_tuple.3 AS timings,
-                  af_tuple.4 AS matched_event_uuids_array_array,
-                  groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-                  mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-                  arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-                  aggregation_target AS aggregation_target
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     e.`$group_0` AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                     if(equals(e.event, 'paid'), 1, 0) AS step_1
-              FROM events AS e
-              LEFT JOIN
-                (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                        groups.group_type_index AS index,
-                        groups.group_key AS key
-                 FROM groups
-                 WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                 GROUP BY groups.group_type_index,
-                          groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-              WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up')), ifNull(equals(e__group_0.properties___industry, 'positive'), 0)), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))
-           GROUP BY aggregation_target
-           HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-        WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-        ORDER BY aggregation_target ASC) AS funnel_actors
-     WHERE ifNull(equals(funnel_actors.steps, 2), 0)
-     GROUP BY funnel_actors.actor_id
-     ORDER BY funnel_actors.actor_id ASC) AS source
-  INNER JOIN
-    (SELECT groups.group_type_index AS index,
-            groups.group_key AS key
-     FROM groups
-     WHERE equals(groups.team_id, 2)
-     GROUP BY groups.group_type_index,
-              groups.group_key) AS groups ON equals(groups.key, source.actor_id)
-  ORDER BY source.actor_id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestClickhouseFunnelCorrelationUDF.test_funnel_correlation_with_properties_and_groups_person_on_events_materialized.2
-  '''
-  SELECT source.actor_id AS actor_id
-  FROM
-    (SELECT funnel_actors.actor_id AS actor_id,
-            any(funnel_actors.matching_events) AS matching_events
-     FROM
-       (SELECT aggregation_target AS actor_id,
-               matched_events_array[plus(step_reached, 1)] AS matching_events,
-               (matched_events_array[1][1]).1 AS timestamp,
-               nullIf((matched_events_array[2][1]).1, 0) AS final_timestamp,
-               (matched_events_array[1][1]).1 AS first_timestamp,
-               steps AS steps,
-               final_timestamp,
-               first_timestamp
-        FROM
-          (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-                  arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-                  af_tuple.1 AS step_reached,
-                  plus(af_tuple.1, 1) AS steps,
-                  af_tuple.2 AS breakdown,
-                  af_tuple.3 AS timings,
-                  af_tuple.4 AS matched_event_uuids_array_array,
-                  groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-                  mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-                  arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-                  aggregation_target AS aggregation_target
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     e.`$group_0` AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                     if(equals(e.event, 'paid'), 1, 0) AS step_1
-              FROM events AS e
-              LEFT JOIN
-                (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                        groups.group_type_index AS index,
-                        groups.group_key AS key
-                 FROM groups
-                 WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                 GROUP BY groups.group_type_index,
-                          groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-              WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up')), ifNull(equals(e__group_0.properties___industry, 'positive'), 0)), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))
-           GROUP BY aggregation_target
-           HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-        WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-        ORDER BY aggregation_target ASC) AS funnel_actors
-     WHERE ifNull(notEquals(funnel_actors.steps, 2), 1)
-     GROUP BY funnel_actors.actor_id
-     ORDER BY funnel_actors.actor_id ASC) AS source
-  INNER JOIN
-    (SELECT groups.group_type_index AS index,
-            groups.group_key AS key
-     FROM groups
-     WHERE equals(groups.team_id, 2)
-     GROUP BY groups.group_type_index,
-              groups.group_key) AS groups ON equals(groups.key, source.actor_id)
-  ORDER BY source.actor_id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestClickhouseFunnelCorrelationUDF.test_funnel_correlation_with_properties_and_groups_person_on_events_materialized.3
-  '''
-  SELECT source.actor_id AS actor_id
-  FROM
-    (SELECT funnel_actors.actor_id AS actor_id,
-            any(funnel_actors.matching_events) AS matching_events
-     FROM
-       (SELECT aggregation_target AS actor_id,
-               matched_events_array[plus(step_reached, 1)] AS matching_events,
-               (matched_events_array[1][1]).1 AS timestamp,
-               nullIf((matched_events_array[2][1]).1, 0) AS final_timestamp,
-               (matched_events_array[1][1]).1 AS first_timestamp,
-               steps AS steps,
-               final_timestamp,
-               first_timestamp
-        FROM
-          (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-                  arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-                  af_tuple.1 AS step_reached,
-                  plus(af_tuple.1, 1) AS steps,
-                  af_tuple.2 AS breakdown,
-                  af_tuple.3 AS timings,
-                  af_tuple.4 AS matched_event_uuids_array_array,
-                  groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-                  mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-                  arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-                  aggregation_target AS aggregation_target
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     e.`$group_0` AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                     if(equals(e.event, 'paid'), 1, 0) AS step_1
-              FROM events AS e
-              LEFT JOIN
-                (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                        groups.group_type_index AS index,
-                        groups.group_key AS key
-                 FROM groups
-                 WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                 GROUP BY groups.group_type_index,
-                          groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-              WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up')), ifNull(equals(e__group_0.properties___industry, 'negative'), 0)), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))
-           GROUP BY aggregation_target
-           HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-        WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-        ORDER BY aggregation_target ASC) AS funnel_actors
-     WHERE ifNull(equals(funnel_actors.steps, 2), 0)
-     GROUP BY funnel_actors.actor_id
-     ORDER BY funnel_actors.actor_id ASC) AS source
-  INNER JOIN
-    (SELECT groups.group_type_index AS index,
-            groups.group_key AS key
-     FROM groups
-     WHERE equals(groups.team_id, 2)
-     GROUP BY groups.group_type_index,
-              groups.group_key) AS groups ON equals(groups.key, source.actor_id)
-  ORDER BY source.actor_id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestClickhouseFunnelCorrelationUDF.test_funnel_correlation_with_properties_and_groups_person_on_events_materialized.4
-  '''
-  SELECT source.actor_id AS actor_id
-  FROM
-    (SELECT funnel_actors.actor_id AS actor_id,
-            any(funnel_actors.matching_events) AS matching_events
-     FROM
-       (SELECT aggregation_target AS actor_id,
-               matched_events_array[plus(step_reached, 1)] AS matching_events,
-               (matched_events_array[1][1]).1 AS timestamp,
-               nullIf((matched_events_array[2][1]).1, 0) AS final_timestamp,
-               (matched_events_array[1][1]).1 AS first_timestamp,
-               steps AS steps,
-               final_timestamp,
-               first_timestamp
-        FROM
-          (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-                  arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-                  af_tuple.1 AS step_reached,
-                  plus(af_tuple.1, 1) AS steps,
-                  af_tuple.2 AS breakdown,
-                  af_tuple.3 AS timings,
-                  af_tuple.4 AS matched_event_uuids_array_array,
-                  groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-                  mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-                  arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-                  aggregation_target AS aggregation_target
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     e.`$group_0` AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                     if(equals(e.event, 'paid'), 1, 0) AS step_1
-              FROM events AS e
-              LEFT JOIN
-                (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                        groups.group_type_index AS index,
-                        groups.group_key AS key
-                 FROM groups
-                 WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                 GROUP BY groups.group_type_index,
-                          groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-              WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up')), ifNull(equals(e__group_0.properties___industry, 'negative'), 0)), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))
-           GROUP BY aggregation_target
-           HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-        WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-        ORDER BY aggregation_target ASC) AS funnel_actors
-     WHERE ifNull(notEquals(funnel_actors.steps, 2), 1)
-     GROUP BY funnel_actors.actor_id
-     ORDER BY funnel_actors.actor_id ASC) AS source
-  INNER JOIN
-    (SELECT groups.group_type_index AS index,
-            groups.group_key AS key
-     FROM groups
-     WHERE equals(groups.team_id, 2)
-     GROUP BY groups.group_type_index,
-              groups.group_key) AS groups ON equals(groups.key, source.actor_id)
-  ORDER BY source.actor_id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestClickhouseFunnelCorrelationUDF.test_funnel_correlation_with_properties_and_groups_person_on_events_materialized.5
-  '''
-  SELECT concat(ifNull(toString((aggregation_target_with_props.prop).1), ''), '::', ifNull(toString((aggregation_target_with_props.prop).2), '')) AS name,
-         countDistinctIf(aggregation_target_with_props.actor_id, ifNull(equals(aggregation_target_with_props.steps, 2), 0)) AS success_count,
-         countDistinctIf(aggregation_target_with_props.actor_id, ifNull(notEquals(aggregation_target_with_props.steps, 2), 1)) AS failure_count
-  FROM
-    (SELECT funnel_actors.actor_id AS actor_id,
-            funnel_actors.steps AS steps,
-            arrayJoin(JSONExtractKeysAndValues(groups_0.properties, 'String')) AS prop
-     FROM
-       (SELECT aggregation_target AS actor_id,
-               (matched_events_array[1][1]).1 AS timestamp,
-               nullIf((matched_events_array[2][1]).1, 0) AS final_timestamp,
-               (matched_events_array[1][1]).1 AS first_timestamp,
-               steps AS steps,
-               final_timestamp,
-               first_timestamp
-        FROM
-          (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-                  arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-                  af_tuple.1 AS step_reached,
-                  plus(af_tuple.1, 1) AS steps,
-                  af_tuple.2 AS breakdown,
-                  af_tuple.3 AS timings,
-                  af_tuple.4 AS matched_event_uuids_array_array,
-                  groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-                  mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-                  arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-                  aggregation_target AS aggregation_target
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     e.`$group_0` AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                     if(equals(e.event, 'paid'), 1, 0) AS step_1
-              FROM events AS e
-              WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))
-           GROUP BY aggregation_target
-           HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-        WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-        ORDER BY aggregation_target ASC) AS funnel_actors
-     LEFT JOIN
-       (SELECT groups.key AS key,
-               groups.properties AS properties
-        FROM
-          (SELECT argMax(groups.group_properties, toTimeZone(groups._timestamp, 'UTC')) AS properties,
-                  groups.group_type_index AS index,
-                  groups.group_key AS key
-           FROM groups
-           WHERE equals(groups.team_id, 2)
-           GROUP BY groups.group_type_index,
-                    groups.group_key) AS groups
-        WHERE ifNull(equals(groups.index, 0), 0)) AS groups_0 ON equals(funnel_actors.actor_id, groups_0.key)) AS aggregation_target_with_props
-  GROUP BY (aggregation_target_with_props.prop).1, (aggregation_target_with_props.prop).2
-  HAVING ifNull(notIn((aggregation_target_with_props.prop).1, []), 0)
-  LIMIT 100
-  UNION ALL
-  SELECT 'Total_Values_In_Query' AS name,
-         countDistinctIf(funnel_actors.actor_id, ifNull(equals(funnel_actors.steps, 2), 0)) AS success_count,
-         countDistinctIf(funnel_actors.actor_id, ifNull(notEquals(funnel_actors.steps, 2), 1)) AS failure_count
-  FROM
-    (SELECT aggregation_target AS actor_id,
-            (matched_events_array[1][1]).1 AS timestamp,
-            nullIf((matched_events_array[2][1]).1, 0) AS final_timestamp,
-            (matched_events_array[1][1]).1 AS first_timestamp,
-            steps AS steps,
-            final_timestamp,
-            first_timestamp
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               af_tuple.4 AS matched_event_uuids_array_array,
-               groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-               mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-               arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                  e.`$group_0` AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                  if(equals(e.event, 'paid'), 1, 0) AS step_1
-           FROM events AS e
-           WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-     ORDER BY aggregation_target ASC) AS funnel_actors
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestClickhouseFunnelCorrelationUDF.test_funnel_correlation_with_properties_and_groups_person_on_events_poe_v2
-  '''
-  SELECT concat(ifNull(toString((aggregation_target_with_props.prop).1), ''), '::', ifNull(toString((aggregation_target_with_props.prop).2), '')) AS name,
-         countDistinctIf(aggregation_target_with_props.actor_id, ifNull(equals(aggregation_target_with_props.steps, 2), 0)) AS success_count,
-         countDistinctIf(aggregation_target_with_props.actor_id, ifNull(notEquals(aggregation_target_with_props.steps, 2), 1)) AS failure_count
-  FROM
-    (SELECT funnel_actors.actor_id AS actor_id,
-            funnel_actors.steps AS steps,
-            arrayJoin(arrayZip(['industry'], [JSONExtractString(groups_0.properties, 'industry')])) AS prop
-     FROM
-       (SELECT aggregation_target AS actor_id,
-               (matched_events_array[1][1]).1 AS timestamp,
-               nullIf((matched_events_array[2][1]).1, 0) AS final_timestamp,
-               (matched_events_array[1][1]).1 AS first_timestamp,
-               steps AS steps,
-               final_timestamp,
-               first_timestamp
-        FROM
-          (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-                  arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-                  af_tuple.1 AS step_reached,
-                  plus(af_tuple.1, 1) AS steps,
-                  af_tuple.2 AS breakdown,
-                  af_tuple.3 AS timings,
-                  af_tuple.4 AS matched_event_uuids_array_array,
-                  groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-                  mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-                  arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-                  aggregation_target AS aggregation_target
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     e.`$group_0` AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                     if(equals(e.event, 'paid'), 1, 0) AS step_1
-              FROM events AS e
-              WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))
-           GROUP BY aggregation_target
-           HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-        WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-        ORDER BY aggregation_target ASC) AS funnel_actors
-     LEFT JOIN
-       (SELECT groups.key AS key,
-               groups.properties AS properties
-        FROM
-          (SELECT argMax(groups.group_properties, toTimeZone(groups._timestamp, 'UTC')) AS properties,
-                  groups.group_type_index AS index,
-                  groups.group_key AS key
-           FROM groups
-           WHERE equals(groups.team_id, 2)
-           GROUP BY groups.group_type_index,
-                    groups.group_key) AS groups
-        WHERE ifNull(equals(groups.index, 0), 0)) AS groups_0 ON equals(funnel_actors.actor_id, groups_0.key)) AS aggregation_target_with_props
-  GROUP BY (aggregation_target_with_props.prop).1, (aggregation_target_with_props.prop).2
-  HAVING ifNull(notIn((aggregation_target_with_props.prop).1, []), 0)
-  LIMIT 100
-  UNION ALL
-  SELECT 'Total_Values_In_Query' AS name,
-         countDistinctIf(funnel_actors.actor_id, ifNull(equals(funnel_actors.steps, 2), 0)) AS success_count,
-         countDistinctIf(funnel_actors.actor_id, ifNull(notEquals(funnel_actors.steps, 2), 1)) AS failure_count
-  FROM
-    (SELECT aggregation_target AS actor_id,
-            (matched_events_array[1][1]).1 AS timestamp,
-            nullIf((matched_events_array[2][1]).1, 0) AS final_timestamp,
-            (matched_events_array[1][1]).1 AS first_timestamp,
-            steps AS steps,
-            final_timestamp,
-            first_timestamp
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               af_tuple.4 AS matched_event_uuids_array_array,
-               groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-               mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-               arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                  e.`$group_0` AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                  if(equals(e.event, 'paid'), 1, 0) AS step_1
-           FROM events AS e
-           WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-     ORDER BY aggregation_target ASC) AS funnel_actors
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestClickhouseFunnelCorrelationUDF.test_funnel_correlation_with_properties_and_groups_person_on_events_poe_v2.1
-  '''
-  SELECT source.actor_id AS actor_id
-  FROM
-    (SELECT funnel_actors.actor_id AS actor_id,
-            any(funnel_actors.matching_events) AS matching_events
-     FROM
-       (SELECT aggregation_target AS actor_id,
-               matched_events_array[plus(step_reached, 1)] AS matching_events,
-               (matched_events_array[1][1]).1 AS timestamp,
-               nullIf((matched_events_array[2][1]).1, 0) AS final_timestamp,
-               (matched_events_array[1][1]).1 AS first_timestamp,
-               steps AS steps,
-               final_timestamp,
-               first_timestamp
-        FROM
-          (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-                  arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-                  af_tuple.1 AS step_reached,
-                  plus(af_tuple.1, 1) AS steps,
-                  af_tuple.2 AS breakdown,
-                  af_tuple.3 AS timings,
-                  af_tuple.4 AS matched_event_uuids_array_array,
-                  groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-                  mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-                  arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-                  aggregation_target AS aggregation_target
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     e.`$group_0` AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                     if(equals(e.event, 'paid'), 1, 0) AS step_1
-              FROM events AS e
-              LEFT JOIN
-                (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                        groups.group_type_index AS index,
-                        groups.group_key AS key
-                 FROM groups
-                 WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                 GROUP BY groups.group_type_index,
-                          groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-              WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up')), ifNull(equals(e__group_0.properties___industry, 'positive'), 0)), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))
-           GROUP BY aggregation_target
-           HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-        WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-        ORDER BY aggregation_target ASC) AS funnel_actors
-     WHERE ifNull(equals(funnel_actors.steps, 2), 0)
-     GROUP BY funnel_actors.actor_id
-     ORDER BY funnel_actors.actor_id ASC) AS source
-  INNER JOIN
-    (SELECT groups.group_type_index AS index,
-            groups.group_key AS key
-     FROM groups
-     WHERE equals(groups.team_id, 2)
-     GROUP BY groups.group_type_index,
-              groups.group_key) AS groups ON equals(groups.key, source.actor_id)
-  ORDER BY source.actor_id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestClickhouseFunnelCorrelationUDF.test_funnel_correlation_with_properties_and_groups_person_on_events_poe_v2.2
-  '''
-  SELECT source.actor_id AS actor_id
-  FROM
-    (SELECT funnel_actors.actor_id AS actor_id,
-            any(funnel_actors.matching_events) AS matching_events
-     FROM
-       (SELECT aggregation_target AS actor_id,
-               matched_events_array[plus(step_reached, 1)] AS matching_events,
-               (matched_events_array[1][1]).1 AS timestamp,
-               nullIf((matched_events_array[2][1]).1, 0) AS final_timestamp,
-               (matched_events_array[1][1]).1 AS first_timestamp,
-               steps AS steps,
-               final_timestamp,
-               first_timestamp
-        FROM
-          (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-                  arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-                  af_tuple.1 AS step_reached,
-                  plus(af_tuple.1, 1) AS steps,
-                  af_tuple.2 AS breakdown,
-                  af_tuple.3 AS timings,
-                  af_tuple.4 AS matched_event_uuids_array_array,
-                  groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-                  mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-                  arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-                  aggregation_target AS aggregation_target
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     e.`$group_0` AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                     if(equals(e.event, 'paid'), 1, 0) AS step_1
-              FROM events AS e
-              LEFT JOIN
-                (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                        groups.group_type_index AS index,
-                        groups.group_key AS key
-                 FROM groups
-                 WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                 GROUP BY groups.group_type_index,
-                          groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-              WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up')), ifNull(equals(e__group_0.properties___industry, 'positive'), 0)), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))
-           GROUP BY aggregation_target
-           HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-        WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-        ORDER BY aggregation_target ASC) AS funnel_actors
-     WHERE ifNull(notEquals(funnel_actors.steps, 2), 1)
-     GROUP BY funnel_actors.actor_id
-     ORDER BY funnel_actors.actor_id ASC) AS source
-  INNER JOIN
-    (SELECT groups.group_type_index AS index,
-            groups.group_key AS key
-     FROM groups
-     WHERE equals(groups.team_id, 2)
-     GROUP BY groups.group_type_index,
-              groups.group_key) AS groups ON equals(groups.key, source.actor_id)
-  ORDER BY source.actor_id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestClickhouseFunnelCorrelationUDF.test_funnel_correlation_with_properties_and_groups_person_on_events_poe_v2.3
-  '''
-  SELECT source.actor_id AS actor_id
-  FROM
-    (SELECT funnel_actors.actor_id AS actor_id,
-            any(funnel_actors.matching_events) AS matching_events
-     FROM
-       (SELECT aggregation_target AS actor_id,
-               matched_events_array[plus(step_reached, 1)] AS matching_events,
-               (matched_events_array[1][1]).1 AS timestamp,
-               nullIf((matched_events_array[2][1]).1, 0) AS final_timestamp,
-               (matched_events_array[1][1]).1 AS first_timestamp,
-               steps AS steps,
-               final_timestamp,
-               first_timestamp
-        FROM
-          (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-                  arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-                  af_tuple.1 AS step_reached,
-                  plus(af_tuple.1, 1) AS steps,
-                  af_tuple.2 AS breakdown,
-                  af_tuple.3 AS timings,
-                  af_tuple.4 AS matched_event_uuids_array_array,
-                  groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-                  mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-                  arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-                  aggregation_target AS aggregation_target
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     e.`$group_0` AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                     if(equals(e.event, 'paid'), 1, 0) AS step_1
-              FROM events AS e
-              LEFT JOIN
-                (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                        groups.group_type_index AS index,
-                        groups.group_key AS key
-                 FROM groups
-                 WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                 GROUP BY groups.group_type_index,
-                          groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-              WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up')), ifNull(equals(e__group_0.properties___industry, 'negative'), 0)), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))
-           GROUP BY aggregation_target
-           HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-        WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-        ORDER BY aggregation_target ASC) AS funnel_actors
-     WHERE ifNull(equals(funnel_actors.steps, 2), 0)
-     GROUP BY funnel_actors.actor_id
-     ORDER BY funnel_actors.actor_id ASC) AS source
-  INNER JOIN
-    (SELECT groups.group_type_index AS index,
-            groups.group_key AS key
-     FROM groups
-     WHERE equals(groups.team_id, 2)
-     GROUP BY groups.group_type_index,
-              groups.group_key) AS groups ON equals(groups.key, source.actor_id)
-  ORDER BY source.actor_id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestClickhouseFunnelCorrelationUDF.test_funnel_correlation_with_properties_and_groups_person_on_events_poe_v2.4
-  '''
-  SELECT source.actor_id AS actor_id
-  FROM
-    (SELECT funnel_actors.actor_id AS actor_id,
-            any(funnel_actors.matching_events) AS matching_events
-     FROM
-       (SELECT aggregation_target AS actor_id,
-               matched_events_array[plus(step_reached, 1)] AS matching_events,
-               (matched_events_array[1][1]).1 AS timestamp,
-               nullIf((matched_events_array[2][1]).1, 0) AS final_timestamp,
-               (matched_events_array[1][1]).1 AS first_timestamp,
-               steps AS steps,
-               final_timestamp,
-               first_timestamp
-        FROM
-          (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-                  arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-                  af_tuple.1 AS step_reached,
-                  plus(af_tuple.1, 1) AS steps,
-                  af_tuple.2 AS breakdown,
-                  af_tuple.3 AS timings,
-                  af_tuple.4 AS matched_event_uuids_array_array,
-                  groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-                  mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-                  arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-                  aggregation_target AS aggregation_target
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     e.`$group_0` AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                     if(equals(e.event, 'paid'), 1, 0) AS step_1
-              FROM events AS e
-              LEFT JOIN
-                (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                        groups.group_type_index AS index,
-                        groups.group_key AS key
-                 FROM groups
-                 WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                 GROUP BY groups.group_type_index,
-                          groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-              WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up')), ifNull(equals(e__group_0.properties___industry, 'negative'), 0)), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))
-           GROUP BY aggregation_target
-           HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-        WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-        ORDER BY aggregation_target ASC) AS funnel_actors
-     WHERE ifNull(notEquals(funnel_actors.steps, 2), 1)
-     GROUP BY funnel_actors.actor_id
-     ORDER BY funnel_actors.actor_id ASC) AS source
-  INNER JOIN
-    (SELECT groups.group_type_index AS index,
-            groups.group_key AS key
-     FROM groups
-     WHERE equals(groups.team_id, 2)
-     GROUP BY groups.group_type_index,
-              groups.group_key) AS groups ON equals(groups.key, source.actor_id)
-  ORDER BY source.actor_id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestClickhouseFunnelCorrelationUDF.test_funnel_correlation_with_properties_and_groups_person_on_events_poe_v2.5
-  '''
-  SELECT concat(ifNull(toString((aggregation_target_with_props.prop).1), ''), '::', ifNull(toString((aggregation_target_with_props.prop).2), '')) AS name,
-         countDistinctIf(aggregation_target_with_props.actor_id, ifNull(equals(aggregation_target_with_props.steps, 2), 0)) AS success_count,
-         countDistinctIf(aggregation_target_with_props.actor_id, ifNull(notEquals(aggregation_target_with_props.steps, 2), 1)) AS failure_count
-  FROM
-    (SELECT funnel_actors.actor_id AS actor_id,
-            funnel_actors.steps AS steps,
-            arrayJoin(JSONExtractKeysAndValues(groups_0.properties, 'String')) AS prop
-     FROM
-       (SELECT aggregation_target AS actor_id,
-               (matched_events_array[1][1]).1 AS timestamp,
-               nullIf((matched_events_array[2][1]).1, 0) AS final_timestamp,
-               (matched_events_array[1][1]).1 AS first_timestamp,
-               steps AS steps,
-               final_timestamp,
-               first_timestamp
-        FROM
-          (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-                  arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-                  af_tuple.1 AS step_reached,
-                  plus(af_tuple.1, 1) AS steps,
-                  af_tuple.2 AS breakdown,
-                  af_tuple.3 AS timings,
-                  af_tuple.4 AS matched_event_uuids_array_array,
-                  groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-                  mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-                  arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-                  aggregation_target AS aggregation_target
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     e.`$group_0` AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                     if(equals(e.event, 'paid'), 1, 0) AS step_1
-              FROM events AS e
-              WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))
-           GROUP BY aggregation_target
-           HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-        WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-        ORDER BY aggregation_target ASC) AS funnel_actors
-     LEFT JOIN
-       (SELECT groups.key AS key,
-               groups.properties AS properties
-        FROM
-          (SELECT argMax(groups.group_properties, toTimeZone(groups._timestamp, 'UTC')) AS properties,
-                  groups.group_type_index AS index,
-                  groups.group_key AS key
-           FROM groups
-           WHERE equals(groups.team_id, 2)
-           GROUP BY groups.group_type_index,
-                    groups.group_key) AS groups
-        WHERE ifNull(equals(groups.index, 0), 0)) AS groups_0 ON equals(funnel_actors.actor_id, groups_0.key)) AS aggregation_target_with_props
-  GROUP BY (aggregation_target_with_props.prop).1, (aggregation_target_with_props.prop).2
-  HAVING ifNull(notIn((aggregation_target_with_props.prop).1, []), 0)
-  LIMIT 100
-  UNION ALL
-  SELECT 'Total_Values_In_Query' AS name,
-         countDistinctIf(funnel_actors.actor_id, ifNull(equals(funnel_actors.steps, 2), 0)) AS success_count,
-         countDistinctIf(funnel_actors.actor_id, ifNull(notEquals(funnel_actors.steps, 2), 1)) AS failure_count
-  FROM
-    (SELECT aggregation_target AS actor_id,
-            (matched_events_array[1][1]).1 AS timestamp,
-            nullIf((matched_events_array[2][1]).1, 0) AS final_timestamp,
-            (matched_events_array[1][1]).1 AS first_timestamp,
-            steps AS steps,
-            final_timestamp,
-            first_timestamp
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               af_tuple.4 AS matched_event_uuids_array_array,
-               groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-               mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-               arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                  e.`$group_0` AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                  if(equals(e.event, 'paid'), 1, 0) AS step_1
-           FROM events AS e
-           WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-     ORDER BY aggregation_target ASC) AS funnel_actors
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
diff --git a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_persons.ambr b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_persons.ambr
deleted file mode 100644
index 3514a47c2f683..0000000000000
--- a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_persons.ambr
+++ /dev/null
@@ -1,562 +0,0 @@
-# serializer version: 1
-# name: TestFunnelPersons.test_funnel_person_recordings
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         source.matching_events AS matching_events
-  FROM
-    (SELECT aggregation_target AS actor_id,
-            step_0_matching_events AS matching_events
-     FROM
-       (SELECT groupArray(10)(step_0_matching_event) AS step_0_matching_events,
-               groupArray(10)(step_1_matching_event) AS step_1_matching_events,
-               groupArray(10)(step_2_matching_event) AS step_2_matching_events,
-               groupArray(10)(final_matching_event) AS final_matching_events,
-               aggregation_target AS aggregation_target,
-               steps AS steps,
-               avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
-               avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
-               median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
-               median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-        FROM
-          (SELECT tuple(latest_0, uuid_0, `$session_id_0`, `$window_id_0`) AS step_0_matching_event,
-                  tuple(latest_1, uuid_1, `$session_id_1`, `$window_id_1`) AS step_1_matching_event,
-                  tuple(latest_2, uuid_2, `$session_id_2`, `$window_id_2`) AS step_2_matching_event,
-                  if(isNull(latest_0), tuple(NULL, NULL, NULL, NULL), if(isNull(latest_1), step_0_matching_event, if(isNull(latest_2), step_1_matching_event, step_2_matching_event))) AS final_matching_event,
-                  aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  max(steps) OVER (PARTITION BY aggregation_target) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  step_2_conversion_time AS step_2_conversion_time
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     uuid_0 AS uuid_0,
-                     `$session_id_0` AS `$session_id_0`,
-                     `$window_id_0` AS `$window_id_0`,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     uuid_1 AS uuid_1,
-                     `$session_id_1` AS `$session_id_1`,
-                     `$window_id_1` AS `$window_id_1`,
-                     step_2 AS step_2,
-                     latest_2 AS latest_2,
-                     uuid_2 AS uuid_2,
-                     `$session_id_2` AS `$session_id_2`,
-                     `$window_id_2` AS `$window_id_2`,
-                     if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps,
-                     if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
-                     if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time,
-                     tuple(latest_0, uuid_0, `$session_id_0`, `$window_id_0`) AS step_0_matching_event,
-                     tuple(latest_1, uuid_1, `$session_id_1`, `$window_id_1`) AS step_1_matching_event,
-                     tuple(latest_2, uuid_2, `$session_id_2`, `$window_id_2`) AS step_2_matching_event,
-                     if(isNull(latest_0), tuple(NULL, NULL, NULL, NULL), if(isNull(latest_1), step_0_matching_event, if(isNull(latest_2), step_1_matching_event, step_2_matching_event))) AS final_matching_event
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        uuid_0 AS uuid_0,
-                        `$session_id_0` AS `$session_id_0`,
-                        `$window_id_0` AS `$window_id_0`,
-                        step_1 AS step_1,
-                        latest_1 AS latest_1,
-                        uuid_1 AS uuid_1,
-                        `$session_id_1` AS `$session_id_1`,
-                        `$window_id_1` AS `$window_id_1`,
-                        step_2 AS step_2,
-                        min(latest_2) OVER (PARTITION BY aggregation_target
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                           last_value(uuid_2) OVER (PARTITION BY aggregation_target
-                                                                    ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_2,
-                                                                   last_value(`$session_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                     ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_2`,
-                                                                                                    last_value(`$window_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                     ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_2`
-                 FROM
-                   (SELECT aggregation_target AS aggregation_target,
-                           timestamp AS timestamp,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           uuid_0 AS uuid_0,
-                           `$session_id_0` AS `$session_id_0`,
-                           `$window_id_0` AS `$window_id_0`,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           uuid_1 AS uuid_1,
-                           `$session_id_1` AS `$session_id_1`,
-                           `$window_id_1` AS `$window_id_1`,
-                           step_2 AS step_2,
-                           if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2,
-                           if(ifNull(less(latest_2, latest_1), 0), NULL, uuid_2) AS uuid_2,
-                           if(ifNull(less(latest_2, latest_1), 0), NULL, `$session_id_2`) AS `$session_id_2`,
-                           if(ifNull(less(latest_2, latest_1), 0), NULL, `$window_id_2`) AS `$window_id_2`
-                    FROM
-                      (SELECT aggregation_target AS aggregation_target,
-                              timestamp AS timestamp,
-                              step_0 AS step_0,
-                              latest_0 AS latest_0,
-                              uuid_0 AS uuid_0,
-                              `$session_id_0` AS `$session_id_0`,
-                              `$window_id_0` AS `$window_id_0`,
-                              step_1 AS step_1,
-                              min(latest_1) OVER (PARTITION BY aggregation_target
-                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                                 last_value(uuid_1) OVER (PARTITION BY aggregation_target
-                                                                          ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_1,
-                                                                         last_value(`$session_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_1`,
-                                                                                                          last_value(`$window_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_1`,
-                                                                                                                                          step_2 AS step_2,
-                                                                                                                                          min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                              ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                                                                                                                                             last_value(uuid_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                      ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_2,
-                                                                                                                                                                                     last_value(`$session_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                       ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_2`,
-                                                                                                                                                                                                                      last_value(`$window_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                       ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_2`
-                       FROM
-                         (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                                 if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                                 e.uuid AS uuid,
-                                 if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                                 if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                                 if(ifNull(equals(step_0, 1), 0), uuid, NULL) AS uuid_0,
-                                 if(ifNull(equals(step_0, 1), 0), e.`$session_id`, NULL) AS `$session_id_0`,
-                                 if(ifNull(equals(step_0, 1), 0), e.`$window_id`, NULL) AS `$window_id_0`,
-                                 if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                                 if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                                 if(ifNull(equals(step_1, 1), 0), uuid, NULL) AS uuid_1,
-                                 if(ifNull(equals(step_1, 1), 0), e.`$session_id`, NULL) AS `$session_id_1`,
-                                 if(ifNull(equals(step_1, 1), 0), e.`$window_id`, NULL) AS `$window_id_1`,
-                                 if(equals(e.event, 'step three'), 1, 0) AS step_2,
-                                 if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                                 if(ifNull(equals(step_2, 1), 0), uuid, NULL) AS uuid_2,
-                                 if(ifNull(equals(step_2, 1), 0), e.`$session_id`, NULL) AS `$session_id_2`,
-                                 if(ifNull(equals(step_2, 1), 0), e.`$window_id`, NULL) AS `$window_id_2`
-                          FROM events AS e
-                          LEFT OUTER JOIN
-                            (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                    person_distinct_id_overrides.distinct_id AS distinct_id
-                             FROM person_distinct_id_overrides
-                             WHERE equals(person_distinct_id_overrides.team_id, 2)
-                             GROUP BY person_distinct_id_overrides.distinct_id
-                             HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                          WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps))))
-     WHERE ifNull(in(steps, [1, 2, 3]), 0)
-     ORDER BY aggregation_target ASC) AS source
-  INNER JOIN
-    (SELECT person.id AS id
-     FROM person
-     WHERE equals(person.team_id, 2)
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0,
-                    allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelPersons.test_funnel_person_recordings.1
-  '''
-  SELECT DISTINCT session_replay_events.session_id AS session_id
-  FROM session_replay_events
-  WHERE and(equals(session_replay_events.team_id, 2), ifNull(greaterOrEquals(toTimeZone(session_replay_events.min_first_timestamp, 'UTC'), minus(toDateTime64('2021-01-02 00:00:00.000000', 6, 'UTC'), toIntervalDay(21))), 0), in(session_replay_events.session_id, ['s1']))
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestFunnelPersons.test_funnel_person_recordings.2
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         source.matching_events AS matching_events
-  FROM
-    (SELECT aggregation_target AS actor_id,
-            step_1_matching_events AS matching_events
-     FROM
-       (SELECT groupArray(10)(step_0_matching_event) AS step_0_matching_events,
-               groupArray(10)(step_1_matching_event) AS step_1_matching_events,
-               groupArray(10)(step_2_matching_event) AS step_2_matching_events,
-               groupArray(10)(final_matching_event) AS final_matching_events,
-               aggregation_target AS aggregation_target,
-               steps AS steps,
-               avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
-               avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
-               median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
-               median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-        FROM
-          (SELECT tuple(latest_0, uuid_0, `$session_id_0`, `$window_id_0`) AS step_0_matching_event,
-                  tuple(latest_1, uuid_1, `$session_id_1`, `$window_id_1`) AS step_1_matching_event,
-                  tuple(latest_2, uuid_2, `$session_id_2`, `$window_id_2`) AS step_2_matching_event,
-                  if(isNull(latest_0), tuple(NULL, NULL, NULL, NULL), if(isNull(latest_1), step_0_matching_event, if(isNull(latest_2), step_1_matching_event, step_2_matching_event))) AS final_matching_event,
-                  aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  max(steps) OVER (PARTITION BY aggregation_target) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  step_2_conversion_time AS step_2_conversion_time
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     uuid_0 AS uuid_0,
-                     `$session_id_0` AS `$session_id_0`,
-                     `$window_id_0` AS `$window_id_0`,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     uuid_1 AS uuid_1,
-                     `$session_id_1` AS `$session_id_1`,
-                     `$window_id_1` AS `$window_id_1`,
-                     step_2 AS step_2,
-                     latest_2 AS latest_2,
-                     uuid_2 AS uuid_2,
-                     `$session_id_2` AS `$session_id_2`,
-                     `$window_id_2` AS `$window_id_2`,
-                     if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps,
-                     if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
-                     if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time,
-                     tuple(latest_0, uuid_0, `$session_id_0`, `$window_id_0`) AS step_0_matching_event,
-                     tuple(latest_1, uuid_1, `$session_id_1`, `$window_id_1`) AS step_1_matching_event,
-                     tuple(latest_2, uuid_2, `$session_id_2`, `$window_id_2`) AS step_2_matching_event,
-                     if(isNull(latest_0), tuple(NULL, NULL, NULL, NULL), if(isNull(latest_1), step_0_matching_event, if(isNull(latest_2), step_1_matching_event, step_2_matching_event))) AS final_matching_event
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        uuid_0 AS uuid_0,
-                        `$session_id_0` AS `$session_id_0`,
-                        `$window_id_0` AS `$window_id_0`,
-                        step_1 AS step_1,
-                        latest_1 AS latest_1,
-                        uuid_1 AS uuid_1,
-                        `$session_id_1` AS `$session_id_1`,
-                        `$window_id_1` AS `$window_id_1`,
-                        step_2 AS step_2,
-                        min(latest_2) OVER (PARTITION BY aggregation_target
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                           last_value(uuid_2) OVER (PARTITION BY aggregation_target
-                                                                    ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_2,
-                                                                   last_value(`$session_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                     ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_2`,
-                                                                                                    last_value(`$window_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                     ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_2`
-                 FROM
-                   (SELECT aggregation_target AS aggregation_target,
-                           timestamp AS timestamp,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           uuid_0 AS uuid_0,
-                           `$session_id_0` AS `$session_id_0`,
-                           `$window_id_0` AS `$window_id_0`,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           uuid_1 AS uuid_1,
-                           `$session_id_1` AS `$session_id_1`,
-                           `$window_id_1` AS `$window_id_1`,
-                           step_2 AS step_2,
-                           if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2,
-                           if(ifNull(less(latest_2, latest_1), 0), NULL, uuid_2) AS uuid_2,
-                           if(ifNull(less(latest_2, latest_1), 0), NULL, `$session_id_2`) AS `$session_id_2`,
-                           if(ifNull(less(latest_2, latest_1), 0), NULL, `$window_id_2`) AS `$window_id_2`
-                    FROM
-                      (SELECT aggregation_target AS aggregation_target,
-                              timestamp AS timestamp,
-                              step_0 AS step_0,
-                              latest_0 AS latest_0,
-                              uuid_0 AS uuid_0,
-                              `$session_id_0` AS `$session_id_0`,
-                              `$window_id_0` AS `$window_id_0`,
-                              step_1 AS step_1,
-                              min(latest_1) OVER (PARTITION BY aggregation_target
-                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                                 last_value(uuid_1) OVER (PARTITION BY aggregation_target
-                                                                          ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_1,
-                                                                         last_value(`$session_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_1`,
-                                                                                                          last_value(`$window_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_1`,
-                                                                                                                                          step_2 AS step_2,
-                                                                                                                                          min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                              ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                                                                                                                                             last_value(uuid_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                      ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_2,
-                                                                                                                                                                                     last_value(`$session_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                       ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_2`,
-                                                                                                                                                                                                                      last_value(`$window_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                       ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_2`
-                       FROM
-                         (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                                 if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                                 e.uuid AS uuid,
-                                 if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                                 if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                                 if(ifNull(equals(step_0, 1), 0), uuid, NULL) AS uuid_0,
-                                 if(ifNull(equals(step_0, 1), 0), e.`$session_id`, NULL) AS `$session_id_0`,
-                                 if(ifNull(equals(step_0, 1), 0), e.`$window_id`, NULL) AS `$window_id_0`,
-                                 if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                                 if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                                 if(ifNull(equals(step_1, 1), 0), uuid, NULL) AS uuid_1,
-                                 if(ifNull(equals(step_1, 1), 0), e.`$session_id`, NULL) AS `$session_id_1`,
-                                 if(ifNull(equals(step_1, 1), 0), e.`$window_id`, NULL) AS `$window_id_1`,
-                                 if(equals(e.event, 'step three'), 1, 0) AS step_2,
-                                 if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                                 if(ifNull(equals(step_2, 1), 0), uuid, NULL) AS uuid_2,
-                                 if(ifNull(equals(step_2, 1), 0), e.`$session_id`, NULL) AS `$session_id_2`,
-                                 if(ifNull(equals(step_2, 1), 0), e.`$window_id`, NULL) AS `$window_id_2`
-                          FROM events AS e
-                          LEFT OUTER JOIN
-                            (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                    person_distinct_id_overrides.distinct_id AS distinct_id
-                             FROM person_distinct_id_overrides
-                             WHERE equals(person_distinct_id_overrides.team_id, 2)
-                             GROUP BY person_distinct_id_overrides.distinct_id
-                             HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                          WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps))))
-     WHERE ifNull(in(steps, [2, 3]), 0)
-     ORDER BY aggregation_target ASC) AS source
-  INNER JOIN
-    (SELECT person.id AS id
-     FROM person
-     WHERE equals(person.team_id, 2)
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0,
-                    allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelPersons.test_funnel_person_recordings.3
-  '''
-  SELECT DISTINCT session_replay_events.session_id AS session_id
-  FROM session_replay_events
-  WHERE and(equals(session_replay_events.team_id, 2), ifNull(greaterOrEquals(toTimeZone(session_replay_events.min_first_timestamp, 'UTC'), minus(toDateTime64('2021-01-02 00:00:00.000000', 6, 'UTC'), toIntervalDay(21))), 0), in(session_replay_events.session_id, ['s2']))
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestFunnelPersons.test_funnel_person_recordings.4
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         source.matching_events AS matching_events
-  FROM
-    (SELECT aggregation_target AS actor_id,
-            step_1_matching_events AS matching_events
-     FROM
-       (SELECT groupArray(10)(step_0_matching_event) AS step_0_matching_events,
-               groupArray(10)(step_1_matching_event) AS step_1_matching_events,
-               groupArray(10)(step_2_matching_event) AS step_2_matching_events,
-               groupArray(10)(final_matching_event) AS final_matching_events,
-               aggregation_target AS aggregation_target,
-               steps AS steps,
-               avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
-               avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
-               median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
-               median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-        FROM
-          (SELECT tuple(latest_0, uuid_0, `$session_id_0`, `$window_id_0`) AS step_0_matching_event,
-                  tuple(latest_1, uuid_1, `$session_id_1`, `$window_id_1`) AS step_1_matching_event,
-                  tuple(latest_2, uuid_2, `$session_id_2`, `$window_id_2`) AS step_2_matching_event,
-                  if(isNull(latest_0), tuple(NULL, NULL, NULL, NULL), if(isNull(latest_1), step_0_matching_event, if(isNull(latest_2), step_1_matching_event, step_2_matching_event))) AS final_matching_event,
-                  aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  max(steps) OVER (PARTITION BY aggregation_target) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  step_2_conversion_time AS step_2_conversion_time
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     uuid_0 AS uuid_0,
-                     `$session_id_0` AS `$session_id_0`,
-                     `$window_id_0` AS `$window_id_0`,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     uuid_1 AS uuid_1,
-                     `$session_id_1` AS `$session_id_1`,
-                     `$window_id_1` AS `$window_id_1`,
-                     step_2 AS step_2,
-                     latest_2 AS latest_2,
-                     uuid_2 AS uuid_2,
-                     `$session_id_2` AS `$session_id_2`,
-                     `$window_id_2` AS `$window_id_2`,
-                     if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps,
-                     if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
-                     if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time,
-                     tuple(latest_0, uuid_0, `$session_id_0`, `$window_id_0`) AS step_0_matching_event,
-                     tuple(latest_1, uuid_1, `$session_id_1`, `$window_id_1`) AS step_1_matching_event,
-                     tuple(latest_2, uuid_2, `$session_id_2`, `$window_id_2`) AS step_2_matching_event,
-                     if(isNull(latest_0), tuple(NULL, NULL, NULL, NULL), if(isNull(latest_1), step_0_matching_event, if(isNull(latest_2), step_1_matching_event, step_2_matching_event))) AS final_matching_event
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        uuid_0 AS uuid_0,
-                        `$session_id_0` AS `$session_id_0`,
-                        `$window_id_0` AS `$window_id_0`,
-                        step_1 AS step_1,
-                        latest_1 AS latest_1,
-                        uuid_1 AS uuid_1,
-                        `$session_id_1` AS `$session_id_1`,
-                        `$window_id_1` AS `$window_id_1`,
-                        step_2 AS step_2,
-                        min(latest_2) OVER (PARTITION BY aggregation_target
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                           last_value(uuid_2) OVER (PARTITION BY aggregation_target
-                                                                    ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_2,
-                                                                   last_value(`$session_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                     ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_2`,
-                                                                                                    last_value(`$window_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                     ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_2`
-                 FROM
-                   (SELECT aggregation_target AS aggregation_target,
-                           timestamp AS timestamp,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           uuid_0 AS uuid_0,
-                           `$session_id_0` AS `$session_id_0`,
-                           `$window_id_0` AS `$window_id_0`,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           uuid_1 AS uuid_1,
-                           `$session_id_1` AS `$session_id_1`,
-                           `$window_id_1` AS `$window_id_1`,
-                           step_2 AS step_2,
-                           if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2,
-                           if(ifNull(less(latest_2, latest_1), 0), NULL, uuid_2) AS uuid_2,
-                           if(ifNull(less(latest_2, latest_1), 0), NULL, `$session_id_2`) AS `$session_id_2`,
-                           if(ifNull(less(latest_2, latest_1), 0), NULL, `$window_id_2`) AS `$window_id_2`
-                    FROM
-                      (SELECT aggregation_target AS aggregation_target,
-                              timestamp AS timestamp,
-                              step_0 AS step_0,
-                              latest_0 AS latest_0,
-                              uuid_0 AS uuid_0,
-                              `$session_id_0` AS `$session_id_0`,
-                              `$window_id_0` AS `$window_id_0`,
-                              step_1 AS step_1,
-                              min(latest_1) OVER (PARTITION BY aggregation_target
-                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                                 last_value(uuid_1) OVER (PARTITION BY aggregation_target
-                                                                          ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_1,
-                                                                         last_value(`$session_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_1`,
-                                                                                                          last_value(`$window_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_1`,
-                                                                                                                                          step_2 AS step_2,
-                                                                                                                                          min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                              ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                                                                                                                                             last_value(uuid_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                      ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_2,
-                                                                                                                                                                                     last_value(`$session_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                       ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_2`,
-                                                                                                                                                                                                                      last_value(`$window_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                       ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_2`
-                       FROM
-                         (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                                 if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                                 e.uuid AS uuid,
-                                 if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                                 if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                                 if(ifNull(equals(step_0, 1), 0), uuid, NULL) AS uuid_0,
-                                 if(ifNull(equals(step_0, 1), 0), e.`$session_id`, NULL) AS `$session_id_0`,
-                                 if(ifNull(equals(step_0, 1), 0), e.`$window_id`, NULL) AS `$window_id_0`,
-                                 if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                                 if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                                 if(ifNull(equals(step_1, 1), 0), uuid, NULL) AS uuid_1,
-                                 if(ifNull(equals(step_1, 1), 0), e.`$session_id`, NULL) AS `$session_id_1`,
-                                 if(ifNull(equals(step_1, 1), 0), e.`$window_id`, NULL) AS `$window_id_1`,
-                                 if(equals(e.event, 'step three'), 1, 0) AS step_2,
-                                 if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                                 if(ifNull(equals(step_2, 1), 0), uuid, NULL) AS uuid_2,
-                                 if(ifNull(equals(step_2, 1), 0), e.`$session_id`, NULL) AS `$session_id_2`,
-                                 if(ifNull(equals(step_2, 1), 0), e.`$window_id`, NULL) AS `$window_id_2`
-                          FROM events AS e
-                          LEFT OUTER JOIN
-                            (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                    person_distinct_id_overrides.distinct_id AS distinct_id
-                             FROM person_distinct_id_overrides
-                             WHERE equals(person_distinct_id_overrides.team_id, 2)
-                             GROUP BY person_distinct_id_overrides.distinct_id
-                             HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                          WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps))))
-     WHERE ifNull(equals(steps, 2), 0)
-     ORDER BY aggregation_target ASC) AS source
-  INNER JOIN
-    (SELECT person.id AS id
-     FROM person
-     WHERE equals(person.team_id, 2)
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0,
-                    allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelPersons.test_funnel_person_recordings.5
-  '''
-  SELECT DISTINCT session_replay_events.session_id AS session_id
-  FROM session_replay_events
-  WHERE and(equals(session_replay_events.team_id, 2), ifNull(greaterOrEquals(toTimeZone(session_replay_events.min_first_timestamp, 'UTC'), minus(toDateTime64('2021-01-02 00:00:00.000000', 6, 'UTC'), toIntervalDay(21))), 0), in(session_replay_events.session_id, ['s2']))
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
diff --git a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_persons_udf.ambr b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_persons_udf.ambr
deleted file mode 100644
index 4971b402855fb..0000000000000
--- a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_persons_udf.ambr
+++ /dev/null
@@ -1,223 +0,0 @@
-# serializer version: 1
-# name: TestFunnelPersonsUDF.test_funnel_person_recordings
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         source.matching_events AS matching_events
-  FROM
-    (SELECT aggregation_target AS actor_id,
-            matched_events_array[1] AS matching_events
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array(3, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               af_tuple.4 AS matched_event_uuids_array_array,
-               groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-               mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-               arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                  if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                  if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                  if(equals(e.event, 'step three'), 1, 0) AS step_2
-           FROM events AS e
-           LEFT OUTER JOIN
-             (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                     person_distinct_id_overrides.distinct_id AS distinct_id
-              FROM person_distinct_id_overrides
-              WHERE equals(person_distinct_id_overrides.team_id, 2)
-              GROUP BY person_distinct_id_overrides.distinct_id
-              HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-           WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-     ORDER BY aggregation_target ASC) AS source
-  INNER JOIN
-    (SELECT person.id AS id
-     FROM person
-     WHERE equals(person.team_id, 2)
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0,
-                    allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelPersonsUDF.test_funnel_person_recordings.1
-  '''
-  SELECT DISTINCT session_replay_events.session_id AS session_id
-  FROM session_replay_events
-  WHERE and(equals(session_replay_events.team_id, 2), ifNull(greaterOrEquals(toTimeZone(session_replay_events.min_first_timestamp, 'UTC'), minus(toDateTime64('2021-01-02 00:00:00.000000', 6, 'UTC'), toIntervalDay(21))), 0), in(session_replay_events.session_id, ['s1']))
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestFunnelPersonsUDF.test_funnel_person_recordings.2
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         source.matching_events AS matching_events
-  FROM
-    (SELECT aggregation_target AS actor_id,
-            matched_events_array[2] AS matching_events
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array(3, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               af_tuple.4 AS matched_event_uuids_array_array,
-               groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-               mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-               arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                  if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                  if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                  if(equals(e.event, 'step three'), 1, 0) AS step_2
-           FROM events AS e
-           LEFT OUTER JOIN
-             (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                     person_distinct_id_overrides.distinct_id AS distinct_id
-              FROM person_distinct_id_overrides
-              WHERE equals(person_distinct_id_overrides.team_id, 2)
-              GROUP BY person_distinct_id_overrides.distinct_id
-              HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-           WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     WHERE ifNull(greaterOrEquals(step_reached, 1), 0)
-     ORDER BY aggregation_target ASC) AS source
-  INNER JOIN
-    (SELECT person.id AS id
-     FROM person
-     WHERE equals(person.team_id, 2)
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0,
-                    allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelPersonsUDF.test_funnel_person_recordings.3
-  '''
-  SELECT DISTINCT session_replay_events.session_id AS session_id
-  FROM session_replay_events
-  WHERE and(equals(session_replay_events.team_id, 2), ifNull(greaterOrEquals(toTimeZone(session_replay_events.min_first_timestamp, 'UTC'), minus(toDateTime64('2021-01-02 00:00:00.000000', 6, 'UTC'), toIntervalDay(21))), 0), in(session_replay_events.session_id, ['s2']))
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestFunnelPersonsUDF.test_funnel_person_recordings.4
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         source.matching_events AS matching_events
-  FROM
-    (SELECT aggregation_target AS actor_id,
-            matched_events_array[2] AS matching_events
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array(3, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               af_tuple.4 AS matched_event_uuids_array_array,
-               groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-               mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-               arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                  if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                  if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                  if(equals(e.event, 'step three'), 1, 0) AS step_2
-           FROM events AS e
-           LEFT OUTER JOIN
-             (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                     person_distinct_id_overrides.distinct_id AS distinct_id
-              FROM person_distinct_id_overrides
-              WHERE equals(person_distinct_id_overrides.team_id, 2)
-              GROUP BY person_distinct_id_overrides.distinct_id
-              HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-           WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     WHERE ifNull(equals(step_reached, 1), 0)
-     ORDER BY aggregation_target ASC) AS source
-  INNER JOIN
-    (SELECT person.id AS id
-     FROM person
-     WHERE equals(person.team_id, 2)
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0,
-                    allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelPersonsUDF.test_funnel_person_recordings.5
-  '''
-  SELECT DISTINCT session_replay_events.session_id AS session_id
-  FROM session_replay_events
-  WHERE and(equals(session_replay_events.team_id, 2), ifNull(greaterOrEquals(toTimeZone(session_replay_events.min_first_timestamp, 'UTC'), minus(toDateTime64('2021-01-02 00:00:00.000000', 6, 'UTC'), toIntervalDay(21))), 0), in(session_replay_events.session_id, ['s2']))
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
diff --git a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_strict.ambr b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_strict.ambr
deleted file mode 100644
index fd818e1883b2f..0000000000000
--- a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_strict.ambr
+++ /dev/null
@@ -1,1132 +0,0 @@
-# serializer version: 1
-# name: TestFunnelStrictStepsBreakdown.test_funnel_breakdown_correct_breakdown_props_are_chosen
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         if(isNaN(avgArrayOrNull(step_1_conversion_time_array) AS inter_1_conversion), NULL, inter_1_conversion) AS step_1_average_conversion_time,
-         if(isNaN(medianArrayOrNull(step_1_conversion_time_array) AS inter_1_median), NULL, inter_1_median) AS step_1_median_conversion_time,
-         if(ifNull(less(row_number, 26), 0), prop, ['Other']) AS final_prop
-  FROM
-    (SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
-            countIf(ifNull(equals(steps, 2), 0)) AS step_2,
-            groupArray(step_1_conversion_time) AS step_1_conversion_time_array,
-            prop AS prop,
-            row_number() OVER (
-                               ORDER BY step_2 DESC) AS row_number
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               steps AS steps,
-               prop AS prop,
-               prop AS prop,
-               min(step_1_conversion_time) AS step_1_conversion_time
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  prop AS prop,
-                  max(steps) OVER (PARTITION BY aggregation_target,
-                                                prop) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  prop AS prop
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     prop AS prop,
-                     if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1) AS steps,
-                     if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1,
-                                           prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           prop_basic AS prop_basic,
-                           prop,
-                           prop_vals AS prop_vals,
-                           if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, ['']) AS prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(and(equals(e.event, 'buy'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), 'xyz'), 0)), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              [ifNull(toString(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', '')), '')] AS prop_basic,
-                              prop_basic AS prop,
-                              argMinIf(prop, timestamp, notEmpty(arrayFilter(x -> notEmpty(x), prop))) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC')))))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps,
-                 prop
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps))))
-     GROUP BY prop)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelStrictStepsBreakdown.test_funnel_breakdown_correct_breakdown_props_are_chosen_for_step
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         if(isNaN(avgArrayOrNull(step_1_conversion_time_array) AS inter_1_conversion), NULL, inter_1_conversion) AS step_1_average_conversion_time,
-         if(isNaN(medianArrayOrNull(step_1_conversion_time_array) AS inter_1_median), NULL, inter_1_median) AS step_1_median_conversion_time,
-         if(ifNull(less(row_number, 26), 0), prop, ['Other']) AS final_prop
-  FROM
-    (SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
-            countIf(ifNull(equals(steps, 2), 0)) AS step_2,
-            groupArray(step_1_conversion_time) AS step_1_conversion_time_array,
-            prop AS prop,
-            row_number() OVER (
-                               ORDER BY step_2 DESC) AS row_number
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               steps AS steps,
-               prop AS prop,
-               prop AS prop,
-               min(step_1_conversion_time) AS step_1_conversion_time
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  prop AS prop,
-                  max(steps) OVER (PARTITION BY aggregation_target,
-                                                prop) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  prop AS prop
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     prop AS prop,
-                     if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1) AS steps,
-                     if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1,
-                                           prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           prop_basic AS prop_basic,
-                           prop_0 AS prop_0,
-                           prop_1 AS prop_1,
-                           prop,
-                           prop_vals AS prop_vals,
-                           prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(and(equals(e.event, 'buy'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), 'xyz'), 0)), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              [ifNull(toString(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', '')), '')] AS prop_basic,
-                              if(ifNull(equals(step_0, 1), 0), prop_basic, []) AS prop_0,
-                              if(ifNull(equals(step_1, 1), 0), prop_basic, []) AS prop_1,
-                              prop_1 AS prop,
-                              groupUniqArray(prop) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))))) ARRAY
-                    JOIN prop_vals AS prop
-                    WHERE ifNull(notEquals(prop, []), isNotNull(prop)
-                                 or isNotNull([]))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps,
-                 prop
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps))))
-     GROUP BY prop)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelStrictStepsBreakdown.test_funnel_step_multiple_breakdown_snapshot
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         if(isNaN(avgArrayOrNull(step_1_conversion_time_array) AS inter_1_conversion), NULL, inter_1_conversion) AS step_1_average_conversion_time,
-         if(isNaN(medianArrayOrNull(step_1_conversion_time_array) AS inter_1_median), NULL, inter_1_median) AS step_1_median_conversion_time,
-         if(ifNull(less(row_number, 26), 0), prop, ['Other']) AS final_prop
-  FROM
-    (SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
-            countIf(ifNull(equals(steps, 2), 0)) AS step_2,
-            groupArray(step_1_conversion_time) AS step_1_conversion_time_array,
-            prop AS prop,
-            row_number() OVER (
-                               ORDER BY step_2 DESC) AS row_number
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               steps AS steps,
-               prop AS prop,
-               prop AS prop,
-               min(step_1_conversion_time) AS step_1_conversion_time
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  prop AS prop,
-                  max(steps) OVER (PARTITION BY aggregation_target,
-                                                prop) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  prop AS prop
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     prop AS prop,
-                     if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1) AS steps,
-                     if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1,
-                                           prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           prop_basic AS prop_basic,
-                           prop,
-                           prop_vals AS prop_vals,
-                           if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, ['', '']) AS prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'buy'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              [ifNull(toString(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', '')), ''), ifNull(toString(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', '')), '')] AS prop_basic,
-                              prop_basic AS prop,
-                              argMinIf(prop, timestamp, notEmpty(arrayFilter(x -> notEmpty(x), prop))) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC')))))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps,
-                 prop
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps))))
-     GROUP BY prop)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdown.test_funnel_aggregate_by_groups_breakdown_group_person_on_events
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         sum(step_3) AS step_3,
-         if(isNaN(avgArrayOrNull(step_1_conversion_time_array) AS inter_1_conversion), NULL, inter_1_conversion) AS step_1_average_conversion_time,
-         if(isNaN(avgArrayOrNull(step_2_conversion_time_array) AS inter_2_conversion), NULL, inter_2_conversion) AS step_2_average_conversion_time,
-         if(isNaN(medianArrayOrNull(step_1_conversion_time_array) AS inter_1_median), NULL, inter_1_median) AS step_1_median_conversion_time,
-         if(isNaN(medianArrayOrNull(step_2_conversion_time_array) AS inter_2_median), NULL, inter_2_median) AS step_2_median_conversion_time,
-         if(ifNull(less(row_number, 26), 0), prop, 'Other') AS final_prop
-  FROM
-    (SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
-            countIf(ifNull(equals(steps, 2), 0)) AS step_2,
-            countIf(ifNull(equals(steps, 3), 0)) AS step_3,
-            groupArray(step_1_conversion_time) AS step_1_conversion_time_array,
-            groupArray(step_2_conversion_time) AS step_2_conversion_time_array,
-            prop AS prop,
-            row_number() OVER (
-                               ORDER BY step_3 DESC) AS row_number
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               steps AS steps,
-               prop AS prop,
-               prop AS prop,
-               min(step_1_conversion_time) AS step_1_conversion_time,
-               min(step_2_conversion_time) AS step_2_conversion_time
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  prop AS prop,
-                  max(steps) OVER (PARTITION BY aggregation_target,
-                                                prop) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  step_2_conversion_time AS step_2_conversion_time,
-                                  prop AS prop
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     step_2 AS step_2,
-                     latest_2 AS latest_2,
-                     prop AS prop,
-                     if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps,
-                     if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
-                     if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1,
-                                           step_2 AS step_2,
-                                           min(latest_2) OVER (PARTITION BY aggregation_target,
-                                                                            prop
-                                                               ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS latest_2,
-                                                              prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           step_2 AS step_2,
-                           latest_2 AS latest_2,
-                           prop_basic AS prop_basic,
-                           prop,
-                           prop_vals AS prop_vals,
-                           prop_vals AS prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              e.`$group_0` AS aggregation_target,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'play movie'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(equals(e.event, 'buy'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                              ifNull(toString(e__group_0.properties___industry), '') AS prop_basic,
-                              prop_basic AS prop,
-                              argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT JOIN
-                         (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                                 groups.group_type_index AS index,
-                                 groups.group_key AS key
-                          FROM groups
-                          WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                          GROUP BY groups.group_type_index,
-                                   groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-                       WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC')))))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps,
-                 prop
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps))))
-     GROUP BY prop)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdown.test_funnel_aggregate_by_groups_breakdown_group_person_on_events_poe_v2
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         sum(step_3) AS step_3,
-         if(isNaN(avgArrayOrNull(step_1_conversion_time_array) AS inter_1_conversion), NULL, inter_1_conversion) AS step_1_average_conversion_time,
-         if(isNaN(avgArrayOrNull(step_2_conversion_time_array) AS inter_2_conversion), NULL, inter_2_conversion) AS step_2_average_conversion_time,
-         if(isNaN(medianArrayOrNull(step_1_conversion_time_array) AS inter_1_median), NULL, inter_1_median) AS step_1_median_conversion_time,
-         if(isNaN(medianArrayOrNull(step_2_conversion_time_array) AS inter_2_median), NULL, inter_2_median) AS step_2_median_conversion_time,
-         if(ifNull(less(row_number, 26), 0), prop, 'Other') AS final_prop
-  FROM
-    (SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
-            countIf(ifNull(equals(steps, 2), 0)) AS step_2,
-            countIf(ifNull(equals(steps, 3), 0)) AS step_3,
-            groupArray(step_1_conversion_time) AS step_1_conversion_time_array,
-            groupArray(step_2_conversion_time) AS step_2_conversion_time_array,
-            prop AS prop,
-            row_number() OVER (
-                               ORDER BY step_3 DESC) AS row_number
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               steps AS steps,
-               prop AS prop,
-               prop AS prop,
-               min(step_1_conversion_time) AS step_1_conversion_time,
-               min(step_2_conversion_time) AS step_2_conversion_time
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  prop AS prop,
-                  max(steps) OVER (PARTITION BY aggregation_target,
-                                                prop) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  step_2_conversion_time AS step_2_conversion_time,
-                                  prop AS prop
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     step_2 AS step_2,
-                     latest_2 AS latest_2,
-                     prop AS prop,
-                     if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps,
-                     if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
-                     if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1,
-                                           step_2 AS step_2,
-                                           min(latest_2) OVER (PARTITION BY aggregation_target,
-                                                                            prop
-                                                               ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS latest_2,
-                                                              prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           step_2 AS step_2,
-                           latest_2 AS latest_2,
-                           prop_basic AS prop_basic,
-                           prop,
-                           prop_vals AS prop_vals,
-                           prop_vals AS prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              e.`$group_0` AS aggregation_target,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'play movie'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(equals(e.event, 'buy'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                              ifNull(toString(e__group_0.properties___industry), '') AS prop_basic,
-                              prop_basic AS prop,
-                              argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT JOIN
-                         (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                                 groups.group_type_index AS index,
-                                 groups.group_key AS key
-                          FROM groups
-                          WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                          GROUP BY groups.group_type_index,
-                                   groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-                       WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC')))))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps,
-                 prop
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps))))
-     GROUP BY prop)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdown.test_funnel_breakdown_group
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         sum(step_3) AS step_3,
-         if(isNaN(avgArrayOrNull(step_1_conversion_time_array) AS inter_1_conversion), NULL, inter_1_conversion) AS step_1_average_conversion_time,
-         if(isNaN(avgArrayOrNull(step_2_conversion_time_array) AS inter_2_conversion), NULL, inter_2_conversion) AS step_2_average_conversion_time,
-         if(isNaN(medianArrayOrNull(step_1_conversion_time_array) AS inter_1_median), NULL, inter_1_median) AS step_1_median_conversion_time,
-         if(isNaN(medianArrayOrNull(step_2_conversion_time_array) AS inter_2_median), NULL, inter_2_median) AS step_2_median_conversion_time,
-         if(ifNull(less(row_number, 26), 0), prop, 'Other') AS final_prop
-  FROM
-    (SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
-            countIf(ifNull(equals(steps, 2), 0)) AS step_2,
-            countIf(ifNull(equals(steps, 3), 0)) AS step_3,
-            groupArray(step_1_conversion_time) AS step_1_conversion_time_array,
-            groupArray(step_2_conversion_time) AS step_2_conversion_time_array,
-            prop AS prop,
-            row_number() OVER (
-                               ORDER BY step_3 DESC) AS row_number
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               steps AS steps,
-               prop AS prop,
-               prop AS prop,
-               min(step_1_conversion_time) AS step_1_conversion_time,
-               min(step_2_conversion_time) AS step_2_conversion_time
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  prop AS prop,
-                  max(steps) OVER (PARTITION BY aggregation_target,
-                                                prop) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  step_2_conversion_time AS step_2_conversion_time,
-                                  prop AS prop
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     step_2 AS step_2,
-                     latest_2 AS latest_2,
-                     prop AS prop,
-                     if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps,
-                     if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
-                     if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1,
-                                           step_2 AS step_2,
-                                           min(latest_2) OVER (PARTITION BY aggregation_target,
-                                                                            prop
-                                                               ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS latest_2,
-                                                              prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           step_2 AS step_2,
-                           latest_2 AS latest_2,
-                           prop_basic AS prop_basic,
-                           prop,
-                           prop_vals AS prop_vals,
-                           prop_vals AS prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'play movie'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(equals(e.event, 'buy'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                              ifNull(toString(e__group_0.properties___industry), '') AS prop_basic,
-                              prop_basic AS prop,
-                              argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       LEFT JOIN
-                         (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                                 groups.group_type_index AS index,
-                                 groups.group_key AS key
-                          FROM groups
-                          WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                          GROUP BY groups.group_type_index,
-                                   groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-                       WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC')))))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps,
-                 prop
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps))))
-     GROUP BY prop)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdown.test_funnel_breakdown_group.1
-  '''
-  
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdown.test_funnel_breakdown_group.2
-  '''
-  
-  SELECT aggregation_target AS actor_id
-  FROM
-    (SELECT aggregation_target,
-            steps,
-            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
-            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
-            median(step_1_conversion_time) step_1_median_conversion_time_inner,
-            median(step_2_conversion_time) step_2_median_conversion_time_inner,
-            prop
-     FROM
-       (SELECT aggregation_target,
-               steps,
-               max(steps) over (PARTITION BY aggregation_target,
-                                             prop) as max_steps,
-                               step_1_conversion_time,
-                               step_2_conversion_time,
-                               prop
-        FROM
-          (SELECT *,
-                  if(latest_0 <= latest_1
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY
-                     AND latest_1 <= latest_2
-                     AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
-                                                                      AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps,
-                  if(isNotNull(latest_1)
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
-                  if(isNotNull(latest_2)
-                     AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) latest_1,
-                                                                       step_2,
-                                                                       min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                        prop
-                                                                                           ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) latest_2 ,
-                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-              FROM
-                (SELECT *,
-                        prop_vals as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'sign up', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'play movie', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'buy', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2,
-                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    LEFT JOIN
-                      (SELECT group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                       FROM groups
-                       WHERE team_id = 2
-                         AND group_type_index = 0
-                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                    WHERE team_id = 2
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                      AND (1=1) )))
-           WHERE step_0 = 1 ))
-     GROUP BY aggregation_target,
-              steps,
-              max_steps,
-              prop
-     HAVING steps = max_steps)
-  WHERE steps IN [1, 2, 3]
-    AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
-  ORDER BY aggregation_target
-  LIMIT 100
-  OFFSET 0 SETTINGS max_ast_elements=1000000,
-                    max_expanded_ast_elements=1000000
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdown.test_funnel_breakdown_group.3
-  '''
-  
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdown.test_funnel_breakdown_group.4
-  '''
-  
-  SELECT aggregation_target AS actor_id
-  FROM
-    (SELECT aggregation_target,
-            steps,
-            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
-            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
-            median(step_1_conversion_time) step_1_median_conversion_time_inner,
-            median(step_2_conversion_time) step_2_median_conversion_time_inner,
-            prop
-     FROM
-       (SELECT aggregation_target,
-               steps,
-               max(steps) over (PARTITION BY aggregation_target,
-                                             prop) as max_steps,
-                               step_1_conversion_time,
-                               step_2_conversion_time,
-                               prop
-        FROM
-          (SELECT *,
-                  if(latest_0 <= latest_1
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY
-                     AND latest_1 <= latest_2
-                     AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
-                                                                      AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps,
-                  if(isNotNull(latest_1)
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
-                  if(isNotNull(latest_2)
-                     AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) latest_1,
-                                                                       step_2,
-                                                                       min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                        prop
-                                                                                           ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) latest_2 ,
-                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-              FROM
-                (SELECT *,
-                        prop_vals as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'sign up', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'play movie', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'buy', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2,
-                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    LEFT JOIN
-                      (SELECT group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                       FROM groups
-                       WHERE team_id = 2
-                         AND group_type_index = 0
-                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                    WHERE team_id = 2
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                      AND (1=1) )))
-           WHERE step_0 = 1 ))
-     GROUP BY aggregation_target,
-              steps,
-              max_steps,
-              prop
-     HAVING steps = max_steps)
-  WHERE steps IN [2, 3]
-    AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
-  ORDER BY aggregation_target
-  LIMIT 100
-  OFFSET 0 SETTINGS max_ast_elements=1000000,
-                    max_expanded_ast_elements=1000000
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdown.test_funnel_breakdown_group.5
-  '''
-  
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdown.test_funnel_breakdown_group.6
-  '''
-  
-  SELECT aggregation_target AS actor_id
-  FROM
-    (SELECT aggregation_target,
-            steps,
-            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
-            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
-            median(step_1_conversion_time) step_1_median_conversion_time_inner,
-            median(step_2_conversion_time) step_2_median_conversion_time_inner,
-            prop
-     FROM
-       (SELECT aggregation_target,
-               steps,
-               max(steps) over (PARTITION BY aggregation_target,
-                                             prop) as max_steps,
-                               step_1_conversion_time,
-                               step_2_conversion_time,
-                               prop
-        FROM
-          (SELECT *,
-                  if(latest_0 <= latest_1
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY
-                     AND latest_1 <= latest_2
-                     AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
-                                                                      AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps,
-                  if(isNotNull(latest_1)
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
-                  if(isNotNull(latest_2)
-                     AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) latest_1,
-                                                                       step_2,
-                                                                       min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                        prop
-                                                                                           ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) latest_2 ,
-                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-              FROM
-                (SELECT *,
-                        prop_vals as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'sign up', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'play movie', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'buy', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2,
-                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    LEFT JOIN
-                      (SELECT group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                       FROM groups
-                       WHERE team_id = 2
-                         AND group_type_index = 0
-                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                    WHERE team_id = 2
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                      AND (1=1) )))
-           WHERE step_0 = 1 ))
-     GROUP BY aggregation_target,
-              steps,
-              max_steps,
-              prop
-     HAVING steps = max_steps)
-  WHERE steps IN [1, 2, 3]
-    AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
-  ORDER BY aggregation_target
-  LIMIT 100
-  OFFSET 0 SETTINGS max_ast_elements=1000000,
-                    max_expanded_ast_elements=1000000
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdown.test_funnel_breakdown_group.7
-  '''
-  
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdown.test_funnel_breakdown_group.8
-  '''
-  
-  SELECT aggregation_target AS actor_id
-  FROM
-    (SELECT aggregation_target,
-            steps,
-            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
-            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
-            median(step_1_conversion_time) step_1_median_conversion_time_inner,
-            median(step_2_conversion_time) step_2_median_conversion_time_inner,
-            prop
-     FROM
-       (SELECT aggregation_target,
-               steps,
-               max(steps) over (PARTITION BY aggregation_target,
-                                             prop) as max_steps,
-                               step_1_conversion_time,
-                               step_2_conversion_time,
-                               prop
-        FROM
-          (SELECT *,
-                  if(latest_0 <= latest_1
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY
-                     AND latest_1 <= latest_2
-                     AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
-                                                                      AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps,
-                  if(isNotNull(latest_1)
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
-                  if(isNotNull(latest_2)
-                     AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) latest_1,
-                                                                       step_2,
-                                                                       min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                        prop
-                                                                                           ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) latest_2 ,
-                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-              FROM
-                (SELECT *,
-                        prop_vals as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'sign up', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'play movie', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'buy', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2,
-                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    LEFT JOIN
-                      (SELECT group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                       FROM groups
-                       WHERE team_id = 2
-                         AND group_type_index = 0
-                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                    WHERE team_id = 2
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                      AND (1=1) )))
-           WHERE step_0 = 1 ))
-     GROUP BY aggregation_target,
-              steps,
-              max_steps,
-              prop
-     HAVING steps = max_steps)
-  WHERE steps IN [2, 3]
-    AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
-  ORDER BY aggregation_target
-  LIMIT 100
-  OFFSET 0 SETTINGS max_ast_elements=1000000,
-                    max_expanded_ast_elements=1000000
-  '''
-# ---
diff --git a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_strict_persons.ambr b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_strict_persons.ambr
deleted file mode 100644
index b60ff7b55b106..0000000000000
--- a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_strict_persons.ambr
+++ /dev/null
@@ -1,442 +0,0 @@
-# serializer version: 1
-# name: TestFunnelStrictStepsPersons.test_strict_funnel_person_recordings
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         source.matching_events AS matching_events
-  FROM
-    (SELECT aggregation_target AS actor_id,
-            step_0_matching_events AS matching_events
-     FROM
-       (SELECT groupArray(10)(step_0_matching_event) AS step_0_matching_events,
-               groupArray(10)(step_1_matching_event) AS step_1_matching_events,
-               groupArray(10)(step_2_matching_event) AS step_2_matching_events,
-               groupArray(10)(final_matching_event) AS final_matching_events,
-               aggregation_target AS aggregation_target,
-               steps AS steps,
-               avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
-               avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
-               median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
-               median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-        FROM
-          (SELECT tuple(latest_0, uuid_0, `$session_id_0`, `$window_id_0`) AS step_0_matching_event,
-                  tuple(latest_1, uuid_1, `$session_id_1`, `$window_id_1`) AS step_1_matching_event,
-                  tuple(latest_2, uuid_2, `$session_id_2`, `$window_id_2`) AS step_2_matching_event,
-                  if(isNull(latest_0), tuple(NULL, NULL, NULL, NULL), if(isNull(latest_1), step_0_matching_event, if(isNull(latest_2), step_1_matching_event, step_2_matching_event))) AS final_matching_event,
-                  aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  max(steps) OVER (PARTITION BY aggregation_target) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  step_2_conversion_time AS step_2_conversion_time
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     uuid_0 AS uuid_0,
-                     `$session_id_0` AS `$session_id_0`,
-                     `$window_id_0` AS `$window_id_0`,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     uuid_1 AS uuid_1,
-                     `$session_id_1` AS `$session_id_1`,
-                     `$window_id_1` AS `$window_id_1`,
-                     step_2 AS step_2,
-                     latest_2 AS latest_2,
-                     uuid_2 AS uuid_2,
-                     `$session_id_2` AS `$session_id_2`,
-                     `$window_id_2` AS `$window_id_2`,
-                     if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps,
-                     if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
-                     if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time,
-                     tuple(latest_0, uuid_0, `$session_id_0`, `$window_id_0`) AS step_0_matching_event,
-                     tuple(latest_1, uuid_1, `$session_id_1`, `$window_id_1`) AS step_1_matching_event,
-                     tuple(latest_2, uuid_2, `$session_id_2`, `$window_id_2`) AS step_2_matching_event,
-                     if(isNull(latest_0), tuple(NULL, NULL, NULL, NULL), if(isNull(latest_1), step_0_matching_event, if(isNull(latest_2), step_1_matching_event, step_2_matching_event))) AS final_matching_event
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        uuid_0 AS uuid_0,
-                        `$session_id_0` AS `$session_id_0`,
-                        `$window_id_0` AS `$window_id_0`,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target
-                                            ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1,
-                                           min(uuid_1) OVER (PARTITION BY aggregation_target
-                                                             ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS uuid_1,
-                                                            min(`$session_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                       ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS `$session_id_1`,
-                                                                                      min(`$window_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                                ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS `$window_id_1`,
-                                                                                                               step_2 AS step_2,
-                                                                                                               min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                   ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS latest_2,
-                                                                                                                                  min(uuid_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                    ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS uuid_2,
-                                                                                                                                                   min(`$session_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                              ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS `$session_id_2`,
-                                                                                                                                                                             min(`$window_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                       ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS `$window_id_2`
-                 FROM
-                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                           if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                           e.uuid AS uuid,
-                           if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                           if(ifNull(equals(step_0, 1), 0), uuid, NULL) AS uuid_0,
-                           if(ifNull(equals(step_0, 1), 0), e.`$session_id`, NULL) AS `$session_id_0`,
-                           if(ifNull(equals(step_0, 1), 0), e.`$window_id`, NULL) AS `$window_id_0`,
-                           if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                           if(ifNull(equals(step_1, 1), 0), uuid, NULL) AS uuid_1,
-                           if(ifNull(equals(step_1, 1), 0), e.`$session_id`, NULL) AS `$session_id_1`,
-                           if(ifNull(equals(step_1, 1), 0), e.`$window_id`, NULL) AS `$window_id_1`,
-                           if(equals(e.event, 'step three'), 1, 0) AS step_2,
-                           if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                           if(ifNull(equals(step_2, 1), 0), uuid, NULL) AS uuid_2,
-                           if(ifNull(equals(step_2, 1), 0), e.`$session_id`, NULL) AS `$session_id_2`,
-                           if(ifNull(equals(step_2, 1), 0), e.`$window_id`, NULL) AS `$window_id_2`
-                    FROM events AS e
-                    LEFT OUTER JOIN
-                      (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                              person_distinct_id_overrides.distinct_id AS distinct_id
-                       FROM person_distinct_id_overrides
-                       WHERE equals(person_distinct_id_overrides.team_id, 2)
-                       GROUP BY person_distinct_id_overrides.distinct_id
-                       HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                    WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-08 23:59:59.999999', 6, 'UTC'))))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps))))
-     WHERE ifNull(in(steps, [1, 2, 3]), 0)
-     ORDER BY aggregation_target ASC) AS source
-  INNER JOIN
-    (SELECT person.id AS id
-     FROM person
-     WHERE equals(person.team_id, 2)
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0,
-                    allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelStrictStepsPersons.test_strict_funnel_person_recordings.1
-  '''
-  SELECT DISTINCT session_replay_events.session_id AS session_id
-  FROM session_replay_events
-  WHERE and(equals(session_replay_events.team_id, 2), ifNull(greaterOrEquals(toTimeZone(session_replay_events.min_first_timestamp, 'UTC'), minus(toDateTime64('2021-01-02 00:00:00.000000', 6, 'UTC'), toIntervalDay(21))), 0), in(session_replay_events.session_id, ['s1']))
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestFunnelStrictStepsPersons.test_strict_funnel_person_recordings.2
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         source.matching_events AS matching_events
-  FROM
-    (SELECT aggregation_target AS actor_id,
-            step_1_matching_events AS matching_events
-     FROM
-       (SELECT groupArray(10)(step_0_matching_event) AS step_0_matching_events,
-               groupArray(10)(step_1_matching_event) AS step_1_matching_events,
-               groupArray(10)(step_2_matching_event) AS step_2_matching_events,
-               groupArray(10)(final_matching_event) AS final_matching_events,
-               aggregation_target AS aggregation_target,
-               steps AS steps,
-               avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
-               avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
-               median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
-               median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-        FROM
-          (SELECT tuple(latest_0, uuid_0, `$session_id_0`, `$window_id_0`) AS step_0_matching_event,
-                  tuple(latest_1, uuid_1, `$session_id_1`, `$window_id_1`) AS step_1_matching_event,
-                  tuple(latest_2, uuid_2, `$session_id_2`, `$window_id_2`) AS step_2_matching_event,
-                  if(isNull(latest_0), tuple(NULL, NULL, NULL, NULL), if(isNull(latest_1), step_0_matching_event, if(isNull(latest_2), step_1_matching_event, step_2_matching_event))) AS final_matching_event,
-                  aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  max(steps) OVER (PARTITION BY aggregation_target) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  step_2_conversion_time AS step_2_conversion_time
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     uuid_0 AS uuid_0,
-                     `$session_id_0` AS `$session_id_0`,
-                     `$window_id_0` AS `$window_id_0`,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     uuid_1 AS uuid_1,
-                     `$session_id_1` AS `$session_id_1`,
-                     `$window_id_1` AS `$window_id_1`,
-                     step_2 AS step_2,
-                     latest_2 AS latest_2,
-                     uuid_2 AS uuid_2,
-                     `$session_id_2` AS `$session_id_2`,
-                     `$window_id_2` AS `$window_id_2`,
-                     if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps,
-                     if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
-                     if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time,
-                     tuple(latest_0, uuid_0, `$session_id_0`, `$window_id_0`) AS step_0_matching_event,
-                     tuple(latest_1, uuid_1, `$session_id_1`, `$window_id_1`) AS step_1_matching_event,
-                     tuple(latest_2, uuid_2, `$session_id_2`, `$window_id_2`) AS step_2_matching_event,
-                     if(isNull(latest_0), tuple(NULL, NULL, NULL, NULL), if(isNull(latest_1), step_0_matching_event, if(isNull(latest_2), step_1_matching_event, step_2_matching_event))) AS final_matching_event
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        uuid_0 AS uuid_0,
-                        `$session_id_0` AS `$session_id_0`,
-                        `$window_id_0` AS `$window_id_0`,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target
-                                            ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1,
-                                           min(uuid_1) OVER (PARTITION BY aggregation_target
-                                                             ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS uuid_1,
-                                                            min(`$session_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                       ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS `$session_id_1`,
-                                                                                      min(`$window_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                                ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS `$window_id_1`,
-                                                                                                               step_2 AS step_2,
-                                                                                                               min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                   ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS latest_2,
-                                                                                                                                  min(uuid_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                    ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS uuid_2,
-                                                                                                                                                   min(`$session_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                              ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS `$session_id_2`,
-                                                                                                                                                                             min(`$window_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                       ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS `$window_id_2`
-                 FROM
-                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                           if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                           e.uuid AS uuid,
-                           if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                           if(ifNull(equals(step_0, 1), 0), uuid, NULL) AS uuid_0,
-                           if(ifNull(equals(step_0, 1), 0), e.`$session_id`, NULL) AS `$session_id_0`,
-                           if(ifNull(equals(step_0, 1), 0), e.`$window_id`, NULL) AS `$window_id_0`,
-                           if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                           if(ifNull(equals(step_1, 1), 0), uuid, NULL) AS uuid_1,
-                           if(ifNull(equals(step_1, 1), 0), e.`$session_id`, NULL) AS `$session_id_1`,
-                           if(ifNull(equals(step_1, 1), 0), e.`$window_id`, NULL) AS `$window_id_1`,
-                           if(equals(e.event, 'step three'), 1, 0) AS step_2,
-                           if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                           if(ifNull(equals(step_2, 1), 0), uuid, NULL) AS uuid_2,
-                           if(ifNull(equals(step_2, 1), 0), e.`$session_id`, NULL) AS `$session_id_2`,
-                           if(ifNull(equals(step_2, 1), 0), e.`$window_id`, NULL) AS `$window_id_2`
-                    FROM events AS e
-                    LEFT OUTER JOIN
-                      (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                              person_distinct_id_overrides.distinct_id AS distinct_id
-                       FROM person_distinct_id_overrides
-                       WHERE equals(person_distinct_id_overrides.team_id, 2)
-                       GROUP BY person_distinct_id_overrides.distinct_id
-                       HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                    WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-08 23:59:59.999999', 6, 'UTC'))))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps))))
-     WHERE ifNull(in(steps, [2, 3]), 0)
-     ORDER BY aggregation_target ASC) AS source
-  INNER JOIN
-    (SELECT person.id AS id
-     FROM person
-     WHERE equals(person.team_id, 2)
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0,
-                    allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelStrictStepsPersons.test_strict_funnel_person_recordings.3
-  '''
-  SELECT DISTINCT session_replay_events.session_id AS session_id
-  FROM session_replay_events
-  WHERE and(equals(session_replay_events.team_id, 2), ifNull(greaterOrEquals(toTimeZone(session_replay_events.min_first_timestamp, 'UTC'), minus(toDateTime64('2021-01-02 00:00:00.000000', 6, 'UTC'), toIntervalDay(21))), 0), in(session_replay_events.session_id, ['s2']))
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestFunnelStrictStepsPersons.test_strict_funnel_person_recordings.4
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         source.matching_events AS matching_events
-  FROM
-    (SELECT aggregation_target AS actor_id,
-            step_1_matching_events AS matching_events
-     FROM
-       (SELECT groupArray(10)(step_0_matching_event) AS step_0_matching_events,
-               groupArray(10)(step_1_matching_event) AS step_1_matching_events,
-               groupArray(10)(step_2_matching_event) AS step_2_matching_events,
-               groupArray(10)(final_matching_event) AS final_matching_events,
-               aggregation_target AS aggregation_target,
-               steps AS steps,
-               avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
-               avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
-               median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
-               median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-        FROM
-          (SELECT tuple(latest_0, uuid_0, `$session_id_0`, `$window_id_0`) AS step_0_matching_event,
-                  tuple(latest_1, uuid_1, `$session_id_1`, `$window_id_1`) AS step_1_matching_event,
-                  tuple(latest_2, uuid_2, `$session_id_2`, `$window_id_2`) AS step_2_matching_event,
-                  if(isNull(latest_0), tuple(NULL, NULL, NULL, NULL), if(isNull(latest_1), step_0_matching_event, if(isNull(latest_2), step_1_matching_event, step_2_matching_event))) AS final_matching_event,
-                  aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  max(steps) OVER (PARTITION BY aggregation_target) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  step_2_conversion_time AS step_2_conversion_time
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     uuid_0 AS uuid_0,
-                     `$session_id_0` AS `$session_id_0`,
-                     `$window_id_0` AS `$window_id_0`,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     uuid_1 AS uuid_1,
-                     `$session_id_1` AS `$session_id_1`,
-                     `$window_id_1` AS `$window_id_1`,
-                     step_2 AS step_2,
-                     latest_2 AS latest_2,
-                     uuid_2 AS uuid_2,
-                     `$session_id_2` AS `$session_id_2`,
-                     `$window_id_2` AS `$window_id_2`,
-                     if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps,
-                     if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
-                     if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time,
-                     tuple(latest_0, uuid_0, `$session_id_0`, `$window_id_0`) AS step_0_matching_event,
-                     tuple(latest_1, uuid_1, `$session_id_1`, `$window_id_1`) AS step_1_matching_event,
-                     tuple(latest_2, uuid_2, `$session_id_2`, `$window_id_2`) AS step_2_matching_event,
-                     if(isNull(latest_0), tuple(NULL, NULL, NULL, NULL), if(isNull(latest_1), step_0_matching_event, if(isNull(latest_2), step_1_matching_event, step_2_matching_event))) AS final_matching_event
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        uuid_0 AS uuid_0,
-                        `$session_id_0` AS `$session_id_0`,
-                        `$window_id_0` AS `$window_id_0`,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target
-                                            ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1,
-                                           min(uuid_1) OVER (PARTITION BY aggregation_target
-                                                             ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS uuid_1,
-                                                            min(`$session_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                       ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS `$session_id_1`,
-                                                                                      min(`$window_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                                ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS `$window_id_1`,
-                                                                                                               step_2 AS step_2,
-                                                                                                               min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                   ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS latest_2,
-                                                                                                                                  min(uuid_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                    ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS uuid_2,
-                                                                                                                                                   min(`$session_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                              ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS `$session_id_2`,
-                                                                                                                                                                             min(`$window_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                       ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS `$window_id_2`
-                 FROM
-                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                           if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                           e.uuid AS uuid,
-                           if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                           if(ifNull(equals(step_0, 1), 0), uuid, NULL) AS uuid_0,
-                           if(ifNull(equals(step_0, 1), 0), e.`$session_id`, NULL) AS `$session_id_0`,
-                           if(ifNull(equals(step_0, 1), 0), e.`$window_id`, NULL) AS `$window_id_0`,
-                           if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                           if(ifNull(equals(step_1, 1), 0), uuid, NULL) AS uuid_1,
-                           if(ifNull(equals(step_1, 1), 0), e.`$session_id`, NULL) AS `$session_id_1`,
-                           if(ifNull(equals(step_1, 1), 0), e.`$window_id`, NULL) AS `$window_id_1`,
-                           if(equals(e.event, 'step three'), 1, 0) AS step_2,
-                           if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                           if(ifNull(equals(step_2, 1), 0), uuid, NULL) AS uuid_2,
-                           if(ifNull(equals(step_2, 1), 0), e.`$session_id`, NULL) AS `$session_id_2`,
-                           if(ifNull(equals(step_2, 1), 0), e.`$window_id`, NULL) AS `$window_id_2`
-                    FROM events AS e
-                    LEFT OUTER JOIN
-                      (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                              person_distinct_id_overrides.distinct_id AS distinct_id
-                       FROM person_distinct_id_overrides
-                       WHERE equals(person_distinct_id_overrides.team_id, 2)
-                       GROUP BY person_distinct_id_overrides.distinct_id
-                       HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                    WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-08 23:59:59.999999', 6, 'UTC'))))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps))))
-     WHERE ifNull(equals(steps, 2), 0)
-     ORDER BY aggregation_target ASC) AS source
-  INNER JOIN
-    (SELECT person.id AS id
-     FROM person
-     WHERE equals(person.team_id, 2)
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0,
-                    allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelStrictStepsPersons.test_strict_funnel_person_recordings.5
-  '''
-  SELECT DISTINCT session_replay_events.session_id AS session_id
-  FROM session_replay_events
-  WHERE and(equals(session_replay_events.team_id, 2), ifNull(greaterOrEquals(toTimeZone(session_replay_events.min_first_timestamp, 'UTC'), minus(toDateTime64('2021-01-02 00:00:00.000000', 6, 'UTC'), toIntervalDay(21))), 0), in(session_replay_events.session_id, ['s2']))
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
diff --git a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_strict_persons_udf.ambr b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_strict_persons_udf.ambr
deleted file mode 100644
index 118e756719797..0000000000000
--- a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_strict_persons_udf.ambr
+++ /dev/null
@@ -1,226 +0,0 @@
-# serializer version: 1
-# name: TestFunnelStrictStepsPersons.test_strict_funnel_person_recordings
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         source.matching_events AS matching_events
-  FROM
-    (SELECT aggregation_target AS actor_id,
-            matched_events_array[1] AS matching_events
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array_v0(3, 1209600, 'first_touch', 'strict', [[]], arrayFilter((x, x2) -> not(and(empty(x.4), empty(x2.4), ifNull(equals(x.3, x2.3), isNull(x.3)
-                                                                                                                                                             and isNull(x2.3)), ifNull(greater(x.1, x2.1), 0))), events_array, arrayRotateRight(events_array, 1)))) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               af_tuple.4 AS matched_event_uuids_array_array,
-               groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-               mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-               arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                  if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                  if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                  if(equals(e.event, 'step three'), 1, 0) AS step_2
-           FROM events AS e
-           LEFT OUTER JOIN
-             (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                     person_distinct_id_overrides.distinct_id AS distinct_id
-              FROM person_distinct_id_overrides
-              WHERE equals(person_distinct_id_overrides.team_id, 2)
-              GROUP BY person_distinct_id_overrides.distinct_id
-              HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-           WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-08 23:59:59.999999', 6, 'UTC')))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-     ORDER BY aggregation_target ASC) AS source
-  INNER JOIN
-    (SELECT person.id AS id
-     FROM person
-     WHERE equals(person.team_id, 2)
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0,
-                    allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelStrictStepsPersons.test_strict_funnel_person_recordings.1
-  '''
-  SELECT DISTINCT session_replay_events.session_id AS session_id
-  FROM session_replay_events
-  WHERE and(equals(session_replay_events.team_id, 2), ifNull(greaterOrEquals(toTimeZone(session_replay_events.min_first_timestamp, 'UTC'), minus(toDateTime64('2021-01-02 00:00:00.000000', 6, 'UTC'), toIntervalDay(21))), 0), in(session_replay_events.session_id, ['s1']))
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestFunnelStrictStepsPersons.test_strict_funnel_person_recordings.2
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         source.matching_events AS matching_events
-  FROM
-    (SELECT aggregation_target AS actor_id,
-            matched_events_array[2] AS matching_events
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array_v0(3, 1209600, 'first_touch', 'strict', [[]], arrayFilter((x, x2) -> not(and(empty(x.4), empty(x2.4), ifNull(equals(x.3, x2.3), isNull(x.3)
-                                                                                                                                                             and isNull(x2.3)), ifNull(greater(x.1, x2.1), 0))), events_array, arrayRotateRight(events_array, 1)))) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               af_tuple.4 AS matched_event_uuids_array_array,
-               groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-               mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-               arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                  if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                  if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                  if(equals(e.event, 'step three'), 1, 0) AS step_2
-           FROM events AS e
-           LEFT OUTER JOIN
-             (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                     person_distinct_id_overrides.distinct_id AS distinct_id
-              FROM person_distinct_id_overrides
-              WHERE equals(person_distinct_id_overrides.team_id, 2)
-              GROUP BY person_distinct_id_overrides.distinct_id
-              HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-           WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-08 23:59:59.999999', 6, 'UTC')))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     WHERE ifNull(greaterOrEquals(step_reached, 1), 0)
-     ORDER BY aggregation_target ASC) AS source
-  INNER JOIN
-    (SELECT person.id AS id
-     FROM person
-     WHERE equals(person.team_id, 2)
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0,
-                    allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelStrictStepsPersons.test_strict_funnel_person_recordings.3
-  '''
-  SELECT DISTINCT session_replay_events.session_id AS session_id
-  FROM session_replay_events
-  WHERE and(equals(session_replay_events.team_id, 2), ifNull(greaterOrEquals(toTimeZone(session_replay_events.min_first_timestamp, 'UTC'), minus(toDateTime64('2021-01-02 00:00:00.000000', 6, 'UTC'), toIntervalDay(21))), 0), in(session_replay_events.session_id, ['s2']))
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestFunnelStrictStepsPersons.test_strict_funnel_person_recordings.4
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         source.matching_events AS matching_events
-  FROM
-    (SELECT aggregation_target AS actor_id,
-            matched_events_array[2] AS matching_events
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array_v0(3, 1209600, 'first_touch', 'strict', [[]], arrayFilter((x, x2) -> not(and(empty(x.4), empty(x2.4), ifNull(equals(x.3, x2.3), isNull(x.3)
-                                                                                                                                                             and isNull(x2.3)), ifNull(greater(x.1, x2.1), 0))), events_array, arrayRotateRight(events_array, 1)))) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               af_tuple.4 AS matched_event_uuids_array_array,
-               groupArray(tuple(timestamp, uuid, `$session_id`, `$window_id`)) AS user_events,
-               mapFromArrays(arrayMap(x -> x.2, user_events), user_events) AS user_events_map,
-               arrayMap(matched_event_uuids_array -> arrayMap(event_uuid -> user_events_map[event_uuid], arrayDistinct(matched_event_uuids_array)), matched_event_uuids_array_array) AS matched_events_array,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                  if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                  if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                  if(equals(e.event, 'step three'), 1, 0) AS step_2
-           FROM events AS e
-           LEFT OUTER JOIN
-             (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                     person_distinct_id_overrides.distinct_id AS distinct_id
-              FROM person_distinct_id_overrides
-              WHERE equals(person_distinct_id_overrides.team_id, 2)
-              GROUP BY person_distinct_id_overrides.distinct_id
-              HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-           WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-08 23:59:59.999999', 6, 'UTC')))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     WHERE ifNull(equals(step_reached, 1), 0)
-     ORDER BY aggregation_target ASC) AS source
-  INNER JOIN
-    (SELECT person.id AS id
-     FROM person
-     WHERE equals(person.team_id, 2)
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0,
-                    allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelStrictStepsPersons.test_strict_funnel_person_recordings.5
-  '''
-  SELECT DISTINCT session_replay_events.session_id AS session_id
-  FROM session_replay_events
-  WHERE and(equals(session_replay_events.team_id, 2), ifNull(greaterOrEquals(toTimeZone(session_replay_events.min_first_timestamp, 'UTC'), minus(toDateTime64('2021-01-02 00:00:00.000000', 6, 'UTC'), toIntervalDay(21))), 0), in(session_replay_events.session_id, ['s2']))
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
diff --git a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_strict_udf.ambr b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_strict_udf.ambr
deleted file mode 100644
index 5665a00d7ed4e..0000000000000
--- a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_strict_udf.ambr
+++ /dev/null
@@ -1,943 +0,0 @@
-# serializer version: 1
-# name: TestFunnelStrictStepsBreakdownUDF.test_funnel_breakdown_correct_breakdown_props_are_chosen
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_1_conversion_times)])[1] AS step_1_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_1_conversion_times)])[1] AS step_1_median_conversion_time,
-         groupArray(row_number) AS row_number,
-         final_prop AS final_prop
-  FROM
-    (SELECT countIf(ifNull(ifNull(equals(step_reached, 0), 0), 0)) AS step_1,
-            countIf(ifNull(ifNull(equals(step_reached, 1), 0), 0)) AS step_2,
-            groupArrayIf(timings[1], ifNull(greater(timings[1], 0), 0)) AS step_1_conversion_times,
-            rowNumberInBlock() AS row_number,
-            if(ifNull(less(row_number, 25), 0), breakdown, ['Other']) AS final_prop
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, prop, arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array_v0(2, 1209600, 'first_touch', 'strict', groupUniqArray(prop), arrayFilter((x, x2) -> not(and(empty(x.4), empty(x2.4), ifNull(equals(x.3, x2.3), isNull(x.3)
-                                                                                                                                                                             and isNull(x2.3)), ifNull(greater(x.1, x2.1), 0))), events_array, arrayRotateRight(events_array, 1)))) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT timestamp AS timestamp,
-                  aggregation_target AS aggregation_target,
-                  uuid AS uuid,
-                          `$session_id` AS `$session_id`,
-                          `$window_id` AS `$window_id`,
-                          step_0 AS step_0,
-                          step_1 AS step_1,
-                          prop_basic AS prop_basic,
-                          prop,
-                          prop_vals AS prop_vals,
-                          if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, ['']) AS prop
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                     if(and(equals(e.event, 'buy'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), 'xyz'), 0)), 1, 0) AS step_1,
-                     [ifNull(toString(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', '')), '')] AS prop_basic,
-                     prop_basic AS prop,
-                     argMinIf(prop, timestamp, notEmpty(arrayFilter(x -> notEmpty(x), prop))) OVER (PARTITION BY aggregation_target) AS prop_vals
-              FROM events AS e
-              LEFT OUTER JOIN
-                (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                        person_distinct_id_overrides.distinct_id AS distinct_id
-                 FROM person_distinct_id_overrides
-                 WHERE equals(person_distinct_id_overrides.team_id, 2)
-                 GROUP BY person_distinct_id_overrides.distinct_id
-                 HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-              WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     GROUP BY breakdown
-     ORDER BY step_2 DESC, step_1 DESC)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelStrictStepsBreakdownUDF.test_funnel_breakdown_correct_breakdown_props_are_chosen_for_step
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_1_conversion_times)])[1] AS step_1_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_1_conversion_times)])[1] AS step_1_median_conversion_time,
-         groupArray(row_number) AS row_number,
-         final_prop AS final_prop
-  FROM
-    (SELECT countIf(ifNull(ifNull(equals(step_reached, 0), 0), 0)) AS step_1,
-            countIf(ifNull(ifNull(equals(step_reached, 1), 0), 0)) AS step_2,
-            groupArrayIf(timings[1], ifNull(greater(timings[1], 0), 0)) AS step_1_conversion_times,
-            rowNumberInBlock() AS row_number,
-            if(ifNull(less(row_number, 25), 0), breakdown, ['Other']) AS final_prop
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, prop, arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array_v0(2, 1209600, 'step_1', 'strict', groupUniqArray(prop), arrayFilter((x, x2) -> not(and(empty(x.4), empty(x2.4), ifNull(equals(x.3, x2.3), isNull(x.3)
-                                                                                                                                                                        and isNull(x2.3)), ifNull(greater(x.1, x2.1), 0))), events_array, arrayRotateRight(events_array, 1)))) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT timestamp AS timestamp,
-                  aggregation_target AS aggregation_target,
-                  uuid AS uuid,
-                          `$session_id` AS `$session_id`,
-                          `$window_id` AS `$window_id`,
-                          step_0 AS step_0,
-                          step_1 AS step_1,
-                          prop_basic AS prop_basic,
-                          prop_0 AS prop_0,
-                          prop_1 AS prop_1,
-                          prop,
-                          prop_vals AS prop_vals,
-                          prop
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                     if(and(equals(e.event, 'buy'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), 'xyz'), 0)), 1, 0) AS step_1,
-                     [ifNull(toString(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', '')), '')] AS prop_basic,
-                     if(ifNull(equals(step_0, 1), 0), prop_basic, []) AS prop_0,
-                     if(ifNull(equals(step_1, 1), 0), prop_basic, []) AS prop_1,
-                     prop_1 AS prop,
-                     groupUniqArray(prop) OVER (PARTITION BY aggregation_target) AS prop_vals
-              FROM events AS e
-              LEFT OUTER JOIN
-                (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                        person_distinct_id_overrides.distinct_id AS distinct_id
-                 FROM person_distinct_id_overrides
-                 WHERE equals(person_distinct_id_overrides.team_id, 2)
-                 GROUP BY person_distinct_id_overrides.distinct_id
-                 HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-              WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))))) ARRAY
-           JOIN prop_vals AS prop
-           WHERE ifNull(notEquals(prop, []), isNotNull(prop)
-                        or isNotNull([])))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     GROUP BY breakdown
-     ORDER BY step_2 DESC, step_1 DESC)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelStrictStepsBreakdownUDF.test_funnel_step_multiple_breakdown_snapshot
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_1_conversion_times)])[1] AS step_1_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_1_conversion_times)])[1] AS step_1_median_conversion_time,
-         groupArray(row_number) AS row_number,
-         final_prop AS final_prop
-  FROM
-    (SELECT countIf(ifNull(ifNull(equals(step_reached, 0), 0), 0)) AS step_1,
-            countIf(ifNull(ifNull(equals(step_reached, 1), 0), 0)) AS step_2,
-            groupArrayIf(timings[1], ifNull(greater(timings[1], 0), 0)) AS step_1_conversion_times,
-            rowNumberInBlock() AS row_number,
-            if(ifNull(less(row_number, 25), 0), breakdown, ['Other']) AS final_prop
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, prop, arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array_v0(2, 1209600, 'first_touch', 'strict', groupUniqArray(prop), arrayFilter((x, x2) -> not(and(empty(x.4), empty(x2.4), ifNull(equals(x.3, x2.3), isNull(x.3)
-                                                                                                                                                                             and isNull(x2.3)), ifNull(greater(x.1, x2.1), 0))), events_array, arrayRotateRight(events_array, 1)))) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT timestamp AS timestamp,
-                  aggregation_target AS aggregation_target,
-                  uuid AS uuid,
-                          `$session_id` AS `$session_id`,
-                          `$window_id` AS `$window_id`,
-                          step_0 AS step_0,
-                          step_1 AS step_1,
-                          prop_basic AS prop_basic,
-                          prop,
-                          prop_vals AS prop_vals,
-                          if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, ['', '']) AS prop
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                     if(equals(e.event, 'buy'), 1, 0) AS step_1,
-                     [ifNull(toString(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', '')), ''), ifNull(toString(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', '')), '')] AS prop_basic,
-                     prop_basic AS prop,
-                     argMinIf(prop, timestamp, notEmpty(arrayFilter(x -> notEmpty(x), prop))) OVER (PARTITION BY aggregation_target) AS prop_vals
-              FROM events AS e
-              LEFT OUTER JOIN
-                (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                        person_distinct_id_overrides.distinct_id AS distinct_id
-                 FROM person_distinct_id_overrides
-                 WHERE equals(person_distinct_id_overrides.team_id, 2)
-                 GROUP BY person_distinct_id_overrides.distinct_id
-                 HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-              WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     GROUP BY breakdown
-     ORDER BY step_2 DESC, step_1 DESC)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdownUDF.test_funnel_aggregate_by_groups_breakdown_group_person_on_events
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         sum(step_3) AS step_3,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_1_conversion_times)])[1] AS step_1_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_2_conversion_times)])[1] AS step_2_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_1_conversion_times)])[1] AS step_1_median_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_2_conversion_times)])[1] AS step_2_median_conversion_time,
-         groupArray(row_number) AS row_number,
-         final_prop AS final_prop
-  FROM
-    (SELECT countIf(ifNull(ifNull(equals(step_reached, 0), 0), 0)) AS step_1,
-            countIf(ifNull(ifNull(equals(step_reached, 1), 0), 0)) AS step_2,
-            countIf(ifNull(ifNull(equals(step_reached, 2), 0), 0)) AS step_3,
-            groupArrayIf(timings[1], ifNull(greater(timings[1], 0), 0)) AS step_1_conversion_times,
-            groupArrayIf(timings[2], ifNull(greater(timings[2], 0), 0)) AS step_2_conversion_times,
-            rowNumberInBlock() AS row_number,
-            if(ifNull(less(row_number, 25), 0), breakdown, 'Other') AS final_prop
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, prop, arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-               arrayJoin(aggregate_funnel_v0(3, 1209600, 'first_touch', 'strict', groupUniqArray(prop), arrayFilter((x, x2) -> not(and(empty(x.4), empty(x2.4), ifNull(equals(x.3, x2.3), isNull(x.3)
-                                                                                                                                                                       and isNull(x2.3)), ifNull(greater(x.1, x2.1), 0))), events_array, arrayRotateRight(events_array, 1)))) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT timestamp AS timestamp,
-                  aggregation_target AS aggregation_target,
-                  uuid AS uuid,
-                          `$session_id` AS `$session_id`,
-                          `$window_id` AS `$window_id`,
-                          step_0 AS step_0,
-                          step_1 AS step_1,
-                          step_2 AS step_2,
-                          prop_basic AS prop_basic,
-                          prop,
-                          prop_vals AS prop_vals,
-                          prop_vals AS prop
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     e.`$group_0` AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                     if(equals(e.event, 'play movie'), 1, 0) AS step_1,
-                     if(equals(e.event, 'buy'), 1, 0) AS step_2,
-                     ifNull(toString(e__group_0.properties___industry), '') AS prop_basic,
-                     prop_basic AS prop,
-                     argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
-              FROM events AS e
-              LEFT JOIN
-                (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                        groups.group_type_index AS index,
-                        groups.group_key AS key
-                 FROM groups
-                 WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                 GROUP BY groups.group_type_index,
-                          groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-              WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     GROUP BY breakdown
-     ORDER BY step_3 DESC, step_2 DESC, step_1 DESC)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdownUDF.test_funnel_aggregate_by_groups_breakdown_group_person_on_events_poe_v2
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         sum(step_3) AS step_3,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_1_conversion_times)])[1] AS step_1_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_2_conversion_times)])[1] AS step_2_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_1_conversion_times)])[1] AS step_1_median_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_2_conversion_times)])[1] AS step_2_median_conversion_time,
-         groupArray(row_number) AS row_number,
-         final_prop AS final_prop
-  FROM
-    (SELECT countIf(ifNull(ifNull(equals(step_reached, 0), 0), 0)) AS step_1,
-            countIf(ifNull(ifNull(equals(step_reached, 1), 0), 0)) AS step_2,
-            countIf(ifNull(ifNull(equals(step_reached, 2), 0), 0)) AS step_3,
-            groupArrayIf(timings[1], ifNull(greater(timings[1], 0), 0)) AS step_1_conversion_times,
-            groupArrayIf(timings[2], ifNull(greater(timings[2], 0), 0)) AS step_2_conversion_times,
-            rowNumberInBlock() AS row_number,
-            if(ifNull(less(row_number, 25), 0), breakdown, 'Other') AS final_prop
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, prop, arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-               arrayJoin(aggregate_funnel_v0(3, 1209600, 'first_touch', 'strict', groupUniqArray(prop), arrayFilter((x, x2) -> not(and(empty(x.4), empty(x2.4), ifNull(equals(x.3, x2.3), isNull(x.3)
-                                                                                                                                                                       and isNull(x2.3)), ifNull(greater(x.1, x2.1), 0))), events_array, arrayRotateRight(events_array, 1)))) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT timestamp AS timestamp,
-                  aggregation_target AS aggregation_target,
-                  uuid AS uuid,
-                          `$session_id` AS `$session_id`,
-                          `$window_id` AS `$window_id`,
-                          step_0 AS step_0,
-                          step_1 AS step_1,
-                          step_2 AS step_2,
-                          prop_basic AS prop_basic,
-                          prop,
-                          prop_vals AS prop_vals,
-                          prop_vals AS prop
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     e.`$group_0` AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                     if(equals(e.event, 'play movie'), 1, 0) AS step_1,
-                     if(equals(e.event, 'buy'), 1, 0) AS step_2,
-                     ifNull(toString(e__group_0.properties___industry), '') AS prop_basic,
-                     prop_basic AS prop,
-                     argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
-              FROM events AS e
-              LEFT JOIN
-                (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                        groups.group_type_index AS index,
-                        groups.group_key AS key
-                 FROM groups
-                 WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                 GROUP BY groups.group_type_index,
-                          groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-              WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     GROUP BY breakdown
-     ORDER BY step_3 DESC, step_2 DESC, step_1 DESC)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdownUDF.test_funnel_breakdown_group
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         sum(step_3) AS step_3,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_1_conversion_times)])[1] AS step_1_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_2_conversion_times)])[1] AS step_2_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_1_conversion_times)])[1] AS step_1_median_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_2_conversion_times)])[1] AS step_2_median_conversion_time,
-         groupArray(row_number) AS row_number,
-         final_prop AS final_prop
-  FROM
-    (SELECT countIf(ifNull(ifNull(equals(step_reached, 0), 0), 0)) AS step_1,
-            countIf(ifNull(ifNull(equals(step_reached, 1), 0), 0)) AS step_2,
-            countIf(ifNull(ifNull(equals(step_reached, 2), 0), 0)) AS step_3,
-            groupArrayIf(timings[1], ifNull(greater(timings[1], 0), 0)) AS step_1_conversion_times,
-            groupArrayIf(timings[2], ifNull(greater(timings[2], 0), 0)) AS step_2_conversion_times,
-            rowNumberInBlock() AS row_number,
-            if(ifNull(less(row_number, 25), 0), breakdown, 'Other') AS final_prop
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, prop, arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-               arrayJoin(aggregate_funnel_v0(3, 1209600, 'first_touch', 'strict', groupUniqArray(prop), arrayFilter((x, x2) -> not(and(empty(x.4), empty(x2.4), ifNull(equals(x.3, x2.3), isNull(x.3)
-                                                                                                                                                                       and isNull(x2.3)), ifNull(greater(x.1, x2.1), 0))), events_array, arrayRotateRight(events_array, 1)))) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT timestamp AS timestamp,
-                  aggregation_target AS aggregation_target,
-                  uuid AS uuid,
-                          `$session_id` AS `$session_id`,
-                          `$window_id` AS `$window_id`,
-                          step_0 AS step_0,
-                          step_1 AS step_1,
-                          step_2 AS step_2,
-                          prop_basic AS prop_basic,
-                          prop,
-                          prop_vals AS prop_vals,
-                          prop_vals AS prop
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                     if(equals(e.event, 'play movie'), 1, 0) AS step_1,
-                     if(equals(e.event, 'buy'), 1, 0) AS step_2,
-                     ifNull(toString(e__group_0.properties___industry), '') AS prop_basic,
-                     prop_basic AS prop,
-                     argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
-              FROM events AS e
-              LEFT OUTER JOIN
-                (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                        person_distinct_id_overrides.distinct_id AS distinct_id
-                 FROM person_distinct_id_overrides
-                 WHERE equals(person_distinct_id_overrides.team_id, 2)
-                 GROUP BY person_distinct_id_overrides.distinct_id
-                 HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-              LEFT JOIN
-                (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                        groups.group_type_index AS index,
-                        groups.group_key AS key
-                 FROM groups
-                 WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                 GROUP BY groups.group_type_index,
-                          groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-              WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     GROUP BY breakdown
-     ORDER BY step_3 DESC, step_2 DESC, step_1 DESC)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdownUDF.test_funnel_breakdown_group.1
-  '''
-
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdownUDF.test_funnel_breakdown_group.2
-  '''
-
-  SELECT aggregation_target AS actor_id
-  FROM
-    (SELECT aggregation_target,
-            steps,
-            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
-            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
-            median(step_1_conversion_time) step_1_median_conversion_time_inner,
-            median(step_2_conversion_time) step_2_median_conversion_time_inner,
-            prop
-     FROM
-       (SELECT aggregation_target,
-               steps,
-               max(steps) over (PARTITION BY aggregation_target,
-                                             prop) as max_steps,
-                               step_1_conversion_time,
-                               step_2_conversion_time,
-                               prop
-        FROM
-          (SELECT *,
-                  if(latest_0 <= latest_1
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY
-                     AND latest_1 <= latest_2
-                     AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
-                                                                      AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps,
-                  if(isNotNull(latest_1)
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
-                  if(isNotNull(latest_2)
-                     AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) latest_1,
-                                                                       step_2,
-                                                                       min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                        prop
-                                                                                           ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) latest_2 ,
-                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-              FROM
-                (SELECT *,
-                        prop_vals as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'sign up', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'play movie', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'buy', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2,
-                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    LEFT JOIN
-                      (SELECT group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                       FROM groups
-                       WHERE team_id = 2
-                         AND group_type_index = 0
-                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                    WHERE team_id = 2
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                      AND (1=1) )))
-           WHERE step_0 = 1 ))
-     GROUP BY aggregation_target,
-              steps,
-              max_steps,
-              prop
-     HAVING steps = max_steps)
-  WHERE steps IN [1, 2, 3]
-    AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
-  ORDER BY aggregation_target
-  LIMIT 100
-  OFFSET 0 SETTINGS max_ast_elements=1000000,
-                    max_expanded_ast_elements=1000000
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdownUDF.test_funnel_breakdown_group.3
-  '''
-
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdownUDF.test_funnel_breakdown_group.4
-  '''
-
-  SELECT aggregation_target AS actor_id
-  FROM
-    (SELECT aggregation_target,
-            steps,
-            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
-            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
-            median(step_1_conversion_time) step_1_median_conversion_time_inner,
-            median(step_2_conversion_time) step_2_median_conversion_time_inner,
-            prop
-     FROM
-       (SELECT aggregation_target,
-               steps,
-               max(steps) over (PARTITION BY aggregation_target,
-                                             prop) as max_steps,
-                               step_1_conversion_time,
-                               step_2_conversion_time,
-                               prop
-        FROM
-          (SELECT *,
-                  if(latest_0 <= latest_1
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY
-                     AND latest_1 <= latest_2
-                     AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
-                                                                      AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps,
-                  if(isNotNull(latest_1)
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
-                  if(isNotNull(latest_2)
-                     AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) latest_1,
-                                                                       step_2,
-                                                                       min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                        prop
-                                                                                           ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) latest_2 ,
-                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-              FROM
-                (SELECT *,
-                        prop_vals as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'sign up', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'play movie', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'buy', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2,
-                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    LEFT JOIN
-                      (SELECT group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                       FROM groups
-                       WHERE team_id = 2
-                         AND group_type_index = 0
-                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                    WHERE team_id = 2
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                      AND (1=1) )))
-           WHERE step_0 = 1 ))
-     GROUP BY aggregation_target,
-              steps,
-              max_steps,
-              prop
-     HAVING steps = max_steps)
-  WHERE steps IN [2, 3]
-    AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
-  ORDER BY aggregation_target
-  LIMIT 100
-  OFFSET 0 SETTINGS max_ast_elements=1000000,
-                    max_expanded_ast_elements=1000000
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdownUDF.test_funnel_breakdown_group.5
-  '''
-
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdownUDF.test_funnel_breakdown_group.6
-  '''
-
-  SELECT aggregation_target AS actor_id
-  FROM
-    (SELECT aggregation_target,
-            steps,
-            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
-            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
-            median(step_1_conversion_time) step_1_median_conversion_time_inner,
-            median(step_2_conversion_time) step_2_median_conversion_time_inner,
-            prop
-     FROM
-       (SELECT aggregation_target,
-               steps,
-               max(steps) over (PARTITION BY aggregation_target,
-                                             prop) as max_steps,
-                               step_1_conversion_time,
-                               step_2_conversion_time,
-                               prop
-        FROM
-          (SELECT *,
-                  if(latest_0 <= latest_1
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY
-                     AND latest_1 <= latest_2
-                     AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
-                                                                      AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps,
-                  if(isNotNull(latest_1)
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
-                  if(isNotNull(latest_2)
-                     AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) latest_1,
-                                                                       step_2,
-                                                                       min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                        prop
-                                                                                           ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) latest_2 ,
-                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-              FROM
-                (SELECT *,
-                        prop_vals as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'sign up', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'play movie', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'buy', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2,
-                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    LEFT JOIN
-                      (SELECT group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                       FROM groups
-                       WHERE team_id = 2
-                         AND group_type_index = 0
-                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                    WHERE team_id = 2
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                      AND (1=1) )))
-           WHERE step_0 = 1 ))
-     GROUP BY aggregation_target,
-              steps,
-              max_steps,
-              prop
-     HAVING steps = max_steps)
-  WHERE steps IN [1, 2, 3]
-    AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
-  ORDER BY aggregation_target
-  LIMIT 100
-  OFFSET 0 SETTINGS max_ast_elements=1000000,
-                    max_expanded_ast_elements=1000000
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdownUDF.test_funnel_breakdown_group.7
-  '''
-
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestStrictFunnelGroupBreakdownUDF.test_funnel_breakdown_group.8
-  '''
-
-  SELECT aggregation_target AS actor_id
-  FROM
-    (SELECT aggregation_target,
-            steps,
-            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
-            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
-            median(step_1_conversion_time) step_1_median_conversion_time_inner,
-            median(step_2_conversion_time) step_2_median_conversion_time_inner,
-            prop
-     FROM
-       (SELECT aggregation_target,
-               steps,
-               max(steps) over (PARTITION BY aggregation_target,
-                                             prop) as max_steps,
-                               step_1_conversion_time,
-                               step_2_conversion_time,
-                               prop
-        FROM
-          (SELECT *,
-                  if(latest_0 <= latest_1
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY
-                     AND latest_1 <= latest_2
-                     AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
-                                                                      AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps,
-                  if(isNotNull(latest_1)
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
-                  if(isNotNull(latest_2)
-                     AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) latest_1,
-                                                                       step_2,
-                                                                       min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                        prop
-                                                                                           ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) latest_2 ,
-                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-              FROM
-                (SELECT *,
-                        prop_vals as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'sign up', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'play movie', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'buy', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2,
-                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    LEFT JOIN
-                      (SELECT group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                       FROM groups
-                       WHERE team_id = 2
-                         AND group_type_index = 0
-                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                    WHERE team_id = 2
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                      AND (1=1) )))
-           WHERE step_0 = 1 ))
-     GROUP BY aggregation_target,
-              steps,
-              max_steps,
-              prop
-     HAVING steps = max_steps)
-  WHERE steps IN [2, 3]
-    AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
-  ORDER BY aggregation_target
-  LIMIT 100
-  OFFSET 0 SETTINGS max_ast_elements=1000000,
-                    max_expanded_ast_elements=1000000
-  '''
-# ---
diff --git a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_time_to_convert.ambr b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_time_to_convert.ambr
deleted file mode 100644
index 8594d22687714..0000000000000
--- a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_time_to_convert.ambr
+++ /dev/null
@@ -1,1515 +0,0 @@
-# serializer version: 1
-# name: TestFunnelTimeToConvert.test_auto_bin_count_single_step
-  '''
-  SELECT fill.bin_from_seconds AS bin_from_seconds,
-         results.person_count AS person_count,
-  
-    (SELECT histogram_params.average_conversion_time AS average_conversion_time
-     FROM
-       (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds,
-               ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds,
-               round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time,
-               count() AS sample_count,
-               least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count,
-               ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw,
-               if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
-                  avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
-                  median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
-                  median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     steps AS steps,
-                     max(steps) OVER (PARTITION BY aggregation_target) AS max_steps,
-                                     step_1_conversion_time AS step_1_conversion_time,
-                                     step_2_conversion_time AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        latest_1 AS latest_1,
-                        step_2 AS step_2,
-                        latest_2 AS latest_2,
-                        if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), 2, 1)) AS steps,
-                        if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
-                        if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(7))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-                 FROM
-                   (SELECT aggregation_target AS aggregation_target,
-                           timestamp AS timestamp,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           step_2 AS step_2,
-                           min(latest_2) OVER (PARTITION BY aggregation_target
-                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                    FROM
-                      (SELECT aggregation_target AS aggregation_target,
-                              timestamp AS timestamp,
-                              step_0 AS step_0,
-                              latest_0 AS latest_0,
-                              step_1 AS step_1,
-                              latest_1 AS latest_1,
-                              step_2 AS step_2,
-                              if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2
-                       FROM
-                         (SELECT aggregation_target AS aggregation_target,
-                                 timestamp AS timestamp,
-                                 step_0 AS step_0,
-                                 latest_0 AS latest_0,
-                                 step_1 AS step_1,
-                                 min(latest_1) OVER (PARTITION BY aggregation_target
-                                                     ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                                    step_2 AS step_2,
-                                                    min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                          FROM
-                            (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                                    if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                                    if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                                    if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                                    if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                                    if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                                    if(equals(e.event, 'step three'), 1, 0) AS step_2,
-                                    if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                             FROM events AS e
-                             LEFT OUTER JOIN
-                               (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                       person_distinct_id_overrides.distinct_id AS distinct_id
-                                FROM person_distinct_id_overrides
-                                WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                GROUP BY person_distinct_id_overrides.distinct_id
-                                HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                             WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
-                 WHERE ifNull(equals(step_0, 1), 0)))
-           GROUP BY aggregation_target,
-                    steps
-           HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                         and isNull(max(max_steps)))) AS step_runs
-        WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params) AS average_conversion_time
-  FROM
-    (SELECT plus(
-                   (SELECT histogram_params.from_seconds AS from_seconds
-                    FROM
-                      (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                       FROM
-                         (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                          FROM
-                            (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                             FROM
-                               (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), 2, 1)) AS steps, if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time, if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(7))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-                                FROM
-                                  (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                   FROM
-                                     (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2
-                                      FROM
-                                        (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                             ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                         FROM
-                                           (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                            FROM events AS e
-                                            LEFT OUTER JOIN
-                                              (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                               FROM person_distinct_id_overrides
-                                               WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                               GROUP BY person_distinct_id_overrides.distinct_id
-                                               HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                            WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
-                                WHERE ifNull(equals(step_0, 1), 0)))
-                          GROUP BY aggregation_target, steps
-                          HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                        and isNull(max(max_steps)))) AS step_runs
-                       WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params), multiply(floor(divide(minus(step_runs.step_1_average_conversion_time_inner,
-                                                                                                                                            (SELECT histogram_params.from_seconds AS from_seconds
-                                                                                                                                             FROM
-                                                                                                                                               (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                                                                                                                                                FROM
-                                                                                                                                                  (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                                                                                                                                                   FROM
-                                                                                                                                                     (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                                                                                                                                                      FROM
-                                                                                                                                                        (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), 2, 1)) AS steps, if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time, if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(7))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-                                                                                                                                                         FROM
-                                                                                                                                                           (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                                                                                                                            FROM
-                                                                                                                                                              (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2
-                                                                                                                                                               FROM
-                                                                                                                                                                 (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                                                                                                                      ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                                                                                                                                  FROM
-                                                                                                                                                                    (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                                                                                                                                     FROM events AS e
-                                                                                                                                                                     LEFT OUTER JOIN
-                                                                                                                                                                       (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                                                                                                                                        FROM person_distinct_id_overrides
-                                                                                                                                                                        WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                                                                                                                                        GROUP BY person_distinct_id_overrides.distinct_id
-                                                                                                                                                                        HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                                                                                                                                     WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
-                                                                                                                                                         WHERE ifNull(equals(step_0, 1), 0)))
-                                                                                                                                                   GROUP BY aggregation_target, steps
-                                                                                                                                                   HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                                                                                                                                                 and isNull(max(max_steps)))) AS step_runs
-                                                                                                                                                WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params)),
-                                                                                                                                      (SELECT histogram_params.bin_width_seconds AS bin_width_seconds
-                                                                                                                                       FROM
-                                                                                                                                         (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                                                                                                                                          FROM
-                                                                                                                                            (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                                                                                                                                             FROM
-                                                                                                                                               (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                                                                                                                                                FROM
-                                                                                                                                                  (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), 2, 1)) AS steps, if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time, if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(7))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-                                                                                                                                                   FROM
-                                                                                                                                                     (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                     ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                                                                                                                      FROM
-                                                                                                                                                        (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2
-                                                                                                                                                         FROM
-                                                                                                                                                           (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                   ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                                                                                                                ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                                                                                                                            FROM
-                                                                                                                                                              (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                                                                                                                               FROM events AS e
-                                                                                                                                                               LEFT OUTER JOIN
-                                                                                                                                                                 (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                                                                                                                                  FROM person_distinct_id_overrides
-                                                                                                                                                                  WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                                                                                                                                  GROUP BY person_distinct_id_overrides.distinct_id
-                                                                                                                                                                  HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                                                                                                                               WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
-                                                                                                                                                   WHERE ifNull(equals(step_0, 1), 0)))
-                                                                                                                                             GROUP BY aggregation_target, steps
-                                                                                                                                             HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                                                                                                                                           and isNull(max(max_steps)))) AS step_runs
-                                                                                                                                          WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params))),
-                                                                                                                         (SELECT histogram_params.bin_width_seconds AS bin_width_seconds
-                                                                                                                          FROM
-                                                                                                                            (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                                                                                                                             FROM
-                                                                                                                               (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                                                                                                                                FROM
-                                                                                                                                  (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                                                                                                                                   FROM
-                                                                                                                                     (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), 2, 1)) AS steps, if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time, if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(7))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-                                                                                                                                      FROM
-                                                                                                                                        (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                                                                                                         FROM
-                                                                                                                                           (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2
-                                                                                                                                            FROM
-                                                                                                                                              (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                      ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                                                                                                   ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                                                                                                               FROM
-                                                                                                                                                 (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                                                                                                                  FROM events AS e
-                                                                                                                                                  LEFT OUTER JOIN
-                                                                                                                                                    (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                                                                                                                     FROM person_distinct_id_overrides
-                                                                                                                                                     WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                                                                                                                     GROUP BY person_distinct_id_overrides.distinct_id
-                                                                                                                                                     HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                                                                                                                  WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
-                                                                                                                                      WHERE ifNull(equals(step_0, 1), 0)))
-                                                                                                                                GROUP BY aggregation_target, steps
-                                                                                                                                HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                                                                                                                              and isNull(max(max_steps)))) AS step_runs
-                                                                                                                             WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params))) AS bin_from_seconds,
-            count() AS person_count
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               steps AS steps,
-               avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
-               avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
-               median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
-               median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  max(steps) OVER (PARTITION BY aggregation_target) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  step_2_conversion_time AS step_2_conversion_time
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     step_2 AS step_2,
-                     latest_2 AS latest_2,
-                     if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), 2, 1)) AS steps,
-                     if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
-                     if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(7))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        latest_1 AS latest_1,
-                        step_2 AS step_2,
-                        min(latest_2) OVER (PARTITION BY aggregation_target
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                 FROM
-                   (SELECT aggregation_target AS aggregation_target,
-                           timestamp AS timestamp,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           step_2 AS step_2,
-                           if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2
-                    FROM
-                      (SELECT aggregation_target AS aggregation_target,
-                              timestamp AS timestamp,
-                              step_0 AS step_0,
-                              latest_0 AS latest_0,
-                              step_1 AS step_1,
-                              min(latest_1) OVER (PARTITION BY aggregation_target
-                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                                 step_2 AS step_2,
-                                                 min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                     ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                       FROM
-                         (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                                 if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                                 if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                                 if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                                 if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                                 if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                                 if(equals(e.event, 'step three'), 1, 0) AS step_2,
-                                 if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                          FROM events AS e
-                          LEFT OUTER JOIN
-                            (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                    person_distinct_id_overrides.distinct_id AS distinct_id
-                             FROM person_distinct_id_overrides
-                             WHERE equals(person_distinct_id_overrides.team_id, 2)
-                             GROUP BY person_distinct_id_overrides.distinct_id
-                             HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                          WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps)))) AS step_runs
-     GROUP BY bin_from_seconds) AS results
-  RIGHT OUTER JOIN
-    (SELECT plus(
-                   (SELECT histogram_params.from_seconds AS from_seconds
-                    FROM
-                      (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                       FROM
-                         (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                          FROM
-                            (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                             FROM
-                               (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), 2, 1)) AS steps, if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time, if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(7))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-                                FROM
-                                  (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                   FROM
-                                     (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2
-                                      FROM
-                                        (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                             ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                         FROM
-                                           (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                            FROM events AS e
-                                            LEFT OUTER JOIN
-                                              (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                               FROM person_distinct_id_overrides
-                                               WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                               GROUP BY person_distinct_id_overrides.distinct_id
-                                               HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                            WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
-                                WHERE ifNull(equals(step_0, 1), 0)))
-                          GROUP BY aggregation_target, steps
-                          HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                        and isNull(max(max_steps)))) AS step_runs
-                       WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params), multiply(numbers.number,
-                                                                                                                         (SELECT histogram_params.bin_width_seconds AS bin_width_seconds
-                                                                                                                          FROM
-                                                                                                                            (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                                                                                                                             FROM
-                                                                                                                               (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                                                                                                                                FROM
-                                                                                                                                  (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                                                                                                                                   FROM
-                                                                                                                                     (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), 2, 1)) AS steps, if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time, if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(7))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-                                                                                                                                      FROM
-                                                                                                                                        (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                                                                                                         FROM
-                                                                                                                                           (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2
-                                                                                                                                            FROM
-                                                                                                                                              (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                      ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                                                                                                   ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                                                                                                               FROM
-                                                                                                                                                 (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                                                                                                                  FROM events AS e
-                                                                                                                                                  LEFT OUTER JOIN
-                                                                                                                                                    (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                                                                                                                     FROM person_distinct_id_overrides
-                                                                                                                                                     WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                                                                                                                     GROUP BY person_distinct_id_overrides.distinct_id
-                                                                                                                                                     HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                                                                                                                  WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
-                                                                                                                                      WHERE ifNull(equals(step_0, 1), 0)))
-                                                                                                                                GROUP BY aggregation_target, steps
-                                                                                                                                HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                                                                                                                              and isNull(max(max_steps)))) AS step_runs
-                                                                                                                             WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params))) AS bin_from_seconds
-     FROM numbers(plus(ifNull(
-                                (SELECT histogram_params.bin_count AS bin_count
-                                 FROM
-                                   (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                                    FROM
-                                      (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                                       FROM
-                                         (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                                          FROM
-                                            (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), 2, 1)) AS steps, if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(7))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time, if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(7))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-                                             FROM
-                                               (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                FROM
-                                                  (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2
-                                                   FROM
-                                                     (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                             ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                          ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                      FROM
-                                                        (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                         FROM events AS e
-                                                         LEFT OUTER JOIN
-                                                           (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                            FROM person_distinct_id_overrides
-                                                            WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                            GROUP BY person_distinct_id_overrides.distinct_id
-                                                            HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                         WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
-                                             WHERE ifNull(equals(step_0, 1), 0)))
-                                       GROUP BY aggregation_target, steps
-                                       HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                                     and isNull(max(max_steps)))) AS step_runs
-                                    WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params), 0), 1)) AS numbers) AS fill ON equals(results.bin_from_seconds, fill.bin_from_seconds)
-  ORDER BY fill.bin_from_seconds ASC
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelTimeToConvert.test_basic_strict
-  '''
-  SELECT fill.bin_from_seconds AS bin_from_seconds,
-         results.person_count AS person_count,
-  
-    (SELECT histogram_params.average_conversion_time AS average_conversion_time
-     FROM
-       (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds,
-               ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds,
-               round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time,
-               count() AS sample_count,
-               least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count,
-               ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw,
-               if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
-                  avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
-                  median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
-                  median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     steps AS steps,
-                     max(steps) OVER (PARTITION BY aggregation_target) AS max_steps,
-                                     step_1_conversion_time AS step_1_conversion_time,
-                                     step_2_conversion_time AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        latest_1 AS latest_1,
-                        step_2 AS step_2,
-                        latest_2 AS latest_2,
-                        if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps,
-                        if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
-                        if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-                 FROM
-                   (SELECT aggregation_target AS aggregation_target,
-                           timestamp AS timestamp,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           min(latest_1) OVER (PARTITION BY aggregation_target
-                                               ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1,
-                                              step_2 AS step_2,
-                                              min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                  ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS latest_2
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(equals(e.event, 'step three'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))))))
-                 WHERE ifNull(equals(step_0, 1), 0)))
-           GROUP BY aggregation_target,
-                    steps
-           HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                         and isNull(max(max_steps)))) AS step_runs
-        WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params) AS average_conversion_time
-  FROM
-    (SELECT plus(
-                   (SELECT histogram_params.from_seconds AS from_seconds
-                    FROM
-                      (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                       FROM
-                         (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                          FROM
-                            (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                             FROM
-                               (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps, if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time, if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-                                FROM
-                                  (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                          ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                               ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS latest_2
-                                   FROM
-                                     (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                      FROM events AS e
-                                      LEFT OUTER JOIN
-                                        (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                         FROM person_distinct_id_overrides
-                                         WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                         GROUP BY person_distinct_id_overrides.distinct_id
-                                         HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                      WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))))))
-                                WHERE ifNull(equals(step_0, 1), 0)))
-                          GROUP BY aggregation_target, steps
-                          HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                        and isNull(max(max_steps)))) AS step_runs
-                       WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params), multiply(floor(divide(minus(step_runs.step_1_average_conversion_time_inner,
-                                                                                                                                            (SELECT histogram_params.from_seconds AS from_seconds
-                                                                                                                                             FROM
-                                                                                                                                               (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                                                                                                                                                FROM
-                                                                                                                                                  (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                                                                                                                                                   FROM
-                                                                                                                                                     (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                                                                                                                                                      FROM
-                                                                                                                                                        (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps, if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time, if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-                                                                                                                                                         FROM
-                                                                                                                                                           (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                   ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                                                                                                        ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS latest_2
-                                                                                                                                                            FROM
-                                                                                                                                                              (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                                                                                                                               FROM events AS e
-                                                                                                                                                               LEFT OUTER JOIN
-                                                                                                                                                                 (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                                                                                                                                  FROM person_distinct_id_overrides
-                                                                                                                                                                  WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                                                                                                                                  GROUP BY person_distinct_id_overrides.distinct_id
-                                                                                                                                                                  HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                                                                                                                               WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))))))
-                                                                                                                                                         WHERE ifNull(equals(step_0, 1), 0)))
-                                                                                                                                                   GROUP BY aggregation_target, steps
-                                                                                                                                                   HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                                                                                                                                                 and isNull(max(max_steps)))) AS step_runs
-                                                                                                                                                WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params)),
-                                                                                                                                      (SELECT histogram_params.bin_width_seconds AS bin_width_seconds
-                                                                                                                                       FROM
-                                                                                                                                         (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                                                                                                                                          FROM
-                                                                                                                                            (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                                                                                                                                             FROM
-                                                                                                                                               (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                                                                                                                                                FROM
-                                                                                                                                                  (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps, if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time, if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-                                                                                                                                                   FROM
-                                                                                                                                                     (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                             ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                                                                                                  ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS latest_2
-                                                                                                                                                      FROM
-                                                                                                                                                        (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                                                                                                                         FROM events AS e
-                                                                                                                                                         LEFT OUTER JOIN
-                                                                                                                                                           (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                                                                                                                            FROM person_distinct_id_overrides
-                                                                                                                                                            WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                                                                                                                            GROUP BY person_distinct_id_overrides.distinct_id
-                                                                                                                                                            HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                                                                                                                         WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))))))
-                                                                                                                                                   WHERE ifNull(equals(step_0, 1), 0)))
-                                                                                                                                             GROUP BY aggregation_target, steps
-                                                                                                                                             HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                                                                                                                                           and isNull(max(max_steps)))) AS step_runs
-                                                                                                                                          WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params))),
-                                                                                                                         (SELECT histogram_params.bin_width_seconds AS bin_width_seconds
-                                                                                                                          FROM
-                                                                                                                            (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                                                                                                                             FROM
-                                                                                                                               (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                                                                                                                                FROM
-                                                                                                                                  (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                                                                                                                                   FROM
-                                                                                                                                     (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps, if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time, if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-                                                                                                                                      FROM
-                                                                                                                                        (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                                                                                     ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS latest_2
-                                                                                                                                         FROM
-                                                                                                                                           (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                                                                                                            FROM events AS e
-                                                                                                                                            LEFT OUTER JOIN
-                                                                                                                                              (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                                                                                                               FROM person_distinct_id_overrides
-                                                                                                                                               WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                                                                                                               GROUP BY person_distinct_id_overrides.distinct_id
-                                                                                                                                               HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                                                                                                            WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))))))
-                                                                                                                                      WHERE ifNull(equals(step_0, 1), 0)))
-                                                                                                                                GROUP BY aggregation_target, steps
-                                                                                                                                HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                                                                                                                              and isNull(max(max_steps)))) AS step_runs
-                                                                                                                             WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params))) AS bin_from_seconds,
-            count() AS person_count
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               steps AS steps,
-               avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
-               avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
-               median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
-               median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  max(steps) OVER (PARTITION BY aggregation_target) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  step_2_conversion_time AS step_2_conversion_time
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     step_2 AS step_2,
-                     latest_2 AS latest_2,
-                     if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps,
-                     if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
-                     if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target
-                                            ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1,
-                                           step_2 AS step_2,
-                                           min(latest_2) OVER (PARTITION BY aggregation_target
-                                                               ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS latest_2
-                 FROM
-                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                           if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                           if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                           if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                           if(equals(e.event, 'step three'), 1, 0) AS step_2,
-                           if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                    FROM events AS e
-                    LEFT OUTER JOIN
-                      (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                              person_distinct_id_overrides.distinct_id AS distinct_id
-                       FROM person_distinct_id_overrides
-                       WHERE equals(person_distinct_id_overrides.team_id, 2)
-                       GROUP BY person_distinct_id_overrides.distinct_id
-                       HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                    WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps)))) AS step_runs
-     GROUP BY bin_from_seconds) AS results
-  RIGHT OUTER JOIN
-    (SELECT plus(
-                   (SELECT histogram_params.from_seconds AS from_seconds
-                    FROM
-                      (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                       FROM
-                         (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                          FROM
-                            (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                             FROM
-                               (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps, if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time, if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-                                FROM
-                                  (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                          ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                               ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS latest_2
-                                   FROM
-                                     (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                      FROM events AS e
-                                      LEFT OUTER JOIN
-                                        (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                         FROM person_distinct_id_overrides
-                                         WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                         GROUP BY person_distinct_id_overrides.distinct_id
-                                         HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                      WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))))))
-                                WHERE ifNull(equals(step_0, 1), 0)))
-                          GROUP BY aggregation_target, steps
-                          HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                        and isNull(max(max_steps)))) AS step_runs
-                       WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params), multiply(numbers.number,
-                                                                                                                         (SELECT histogram_params.bin_width_seconds AS bin_width_seconds
-                                                                                                                          FROM
-                                                                                                                            (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                                                                                                                             FROM
-                                                                                                                               (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                                                                                                                                FROM
-                                                                                                                                  (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                                                                                                                                   FROM
-                                                                                                                                     (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps, if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time, if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-                                                                                                                                      FROM
-                                                                                                                                        (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                                                                                     ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS latest_2
-                                                                                                                                         FROM
-                                                                                                                                           (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                                                                                                            FROM events AS e
-                                                                                                                                            LEFT OUTER JOIN
-                                                                                                                                              (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                                                                                                               FROM person_distinct_id_overrides
-                                                                                                                                               WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                                                                                                               GROUP BY person_distinct_id_overrides.distinct_id
-                                                                                                                                               HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                                                                                                            WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))))))
-                                                                                                                                      WHERE ifNull(equals(step_0, 1), 0)))
-                                                                                                                                GROUP BY aggregation_target, steps
-                                                                                                                                HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                                                                                                                              and isNull(max(max_steps)))) AS step_runs
-                                                                                                                             WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params))) AS bin_from_seconds
-     FROM numbers(plus(ifNull(
-                                (SELECT histogram_params.bin_count AS bin_count
-                                 FROM
-                                   (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                                    FROM
-                                      (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                                       FROM
-                                         (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                                          FROM
-                                            (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps, if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time, if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-                                             FROM
-                                               (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                       ORDER BY timestamp DESC ROWS BETWEEN 1 PRECEDING AND 1 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                            ORDER BY timestamp DESC ROWS BETWEEN 2 PRECEDING AND 2 PRECEDING) AS latest_2
-                                                FROM
-                                                  (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                   FROM events AS e
-                                                   LEFT OUTER JOIN
-                                                     (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                      FROM person_distinct_id_overrides
-                                                      WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                      GROUP BY person_distinct_id_overrides.distinct_id
-                                                      HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                   WHERE and(equals(e.team_id, 2), and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))))))
-                                             WHERE ifNull(equals(step_0, 1), 0)))
-                                       GROUP BY aggregation_target, steps
-                                       HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                                     and isNull(max(max_steps)))) AS step_runs
-                                    WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params), 0), 1)) AS numbers) AS fill ON equals(results.bin_from_seconds, fill.bin_from_seconds)
-  ORDER BY fill.bin_from_seconds ASC
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelTimeToConvert.test_basic_unordered
-  '''
-  SELECT fill.bin_from_seconds AS bin_from_seconds,
-         results.person_count AS person_count,
-  
-    (SELECT histogram_params.average_conversion_time AS average_conversion_time
-     FROM
-       (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds,
-               ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds,
-               round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time,
-               count() AS sample_count,
-               least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count,
-               ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw,
-               if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
-                  avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
-                  median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
-                  median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     steps AS steps,
-                     max(steps) OVER (PARTITION BY aggregation_target) AS max_steps,
-                                     step_1_conversion_time AS step_1_conversion_time,
-                                     step_2_conversion_time AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        latest_1 AS latest_1,
-                        step_2 AS step_2,
-                        latest_2 AS latest_2,
-                        arraySort([latest_0, latest_1, latest_2]) AS event_times,
-                        arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                        arraySort([latest_0, latest_1, latest_2]) AS conversion_times,
-                        if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time,
-                        if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                 FROM
-                   (SELECT aggregation_target AS aggregation_target,
-                           timestamp AS timestamp,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           min(latest_1) OVER (PARTITION BY aggregation_target
-                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                              step_2 AS step_2,
-                                              min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(equals(e.event, 'step three'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                 WHERE ifNull(equals(step_0, 1), 0)
-                 UNION ALL SELECT aggregation_target AS aggregation_target,
-                                  timestamp AS timestamp,
-                                  step_0 AS step_0,
-                                  latest_0 AS latest_0,
-                                  step_1 AS step_1,
-                                  latest_1 AS latest_1,
-                                  step_2 AS step_2,
-                                  latest_2 AS latest_2,
-                                  arraySort([latest_0, latest_1, latest_2]) AS event_times,
-                                  arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                                  arraySort([latest_0, latest_1, latest_2]) AS conversion_times,
-                                  if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time,
-                                  if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                 FROM
-                   (SELECT aggregation_target AS aggregation_target,
-                           timestamp AS timestamp,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           min(latest_1) OVER (PARTITION BY aggregation_target
-                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                              step_2 AS step_2,
-                                              min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              if(equals(e.event, 'step two'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'step three'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(equals(e.event, 'step one'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                 WHERE ifNull(equals(step_0, 1), 0)
-                 UNION ALL SELECT aggregation_target AS aggregation_target,
-                                  timestamp AS timestamp,
-                                  step_0 AS step_0,
-                                  latest_0 AS latest_0,
-                                  step_1 AS step_1,
-                                  latest_1 AS latest_1,
-                                  step_2 AS step_2,
-                                  latest_2 AS latest_2,
-                                  arraySort([latest_0, latest_1, latest_2]) AS event_times,
-                                  arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                                  arraySort([latest_0, latest_1, latest_2]) AS conversion_times,
-                                  if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time,
-                                  if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                 FROM
-                   (SELECT aggregation_target AS aggregation_target,
-                           timestamp AS timestamp,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           min(latest_1) OVER (PARTITION BY aggregation_target
-                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                              step_2 AS step_2,
-                                              min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              if(equals(e.event, 'step three'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'step one'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(equals(e.event, 'step two'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                 WHERE ifNull(equals(step_0, 1), 0)))
-           GROUP BY aggregation_target,
-                    steps
-           HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                         and isNull(max(max_steps)))) AS step_runs
-        WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params) AS average_conversion_time
-  FROM
-    (SELECT plus(
-                   (SELECT histogram_params.from_seconds AS from_seconds
-                    FROM
-                      (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                       FROM
-                         (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                          FROM
-                            (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                             FROM
-                               (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                FROM
-                                  (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                          ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                       ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                   FROM
-                                     (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                      FROM events AS e
-                                      LEFT OUTER JOIN
-                                        (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                         FROM person_distinct_id_overrides
-                                         WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                         GROUP BY person_distinct_id_overrides.distinct_id
-                                         HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                      WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                WHERE ifNull(equals(step_0, 1), 0)
-                                UNION ALL SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                FROM
-                                  (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                          ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                       ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                   FROM
-                                     (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step two'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step three'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step one'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                      FROM events AS e
-                                      LEFT OUTER JOIN
-                                        (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                         FROM person_distinct_id_overrides
-                                         WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                         GROUP BY person_distinct_id_overrides.distinct_id
-                                         HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                      WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                WHERE ifNull(equals(step_0, 1), 0)
-                                UNION ALL SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                FROM
-                                  (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                          ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                       ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                   FROM
-                                     (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step three'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step one'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step two'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                      FROM events AS e
-                                      LEFT OUTER JOIN
-                                        (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                         FROM person_distinct_id_overrides
-                                         WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                         GROUP BY person_distinct_id_overrides.distinct_id
-                                         HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                      WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                WHERE ifNull(equals(step_0, 1), 0)))
-                          GROUP BY aggregation_target, steps
-                          HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                        and isNull(max(max_steps)))) AS step_runs
-                       WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params), multiply(floor(divide(minus(step_runs.step_1_average_conversion_time_inner,
-                                                                                                                                            (SELECT histogram_params.from_seconds AS from_seconds
-                                                                                                                                             FROM
-                                                                                                                                               (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                                                                                                                                                FROM
-                                                                                                                                                  (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                                                                                                                                                   FROM
-                                                                                                                                                     (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                                                                                                                                                      FROM
-                                                                                                                                                        (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                                                                                                                                         FROM
-                                                                                                                                                           (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                   ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                                                                                                                ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                                                                                                                            FROM
-                                                                                                                                                              (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                                                                                                                               FROM events AS e
-                                                                                                                                                               LEFT OUTER JOIN
-                                                                                                                                                                 (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                                                                                                                                  FROM person_distinct_id_overrides
-                                                                                                                                                                  WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                                                                                                                                  GROUP BY person_distinct_id_overrides.distinct_id
-                                                                                                                                                                  HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                                                                                                                               WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                                                                                                                                         WHERE ifNull(equals(step_0, 1), 0)
-                                                                                                                                                         UNION ALL SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                                                                                                                                         FROM
-                                                                                                                                                           (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                   ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                                                                                                                ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                                                                                                                            FROM
-                                                                                                                                                              (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step two'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step three'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step one'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                                                                                                                               FROM events AS e
-                                                                                                                                                               LEFT OUTER JOIN
-                                                                                                                                                                 (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                                                                                                                                  FROM person_distinct_id_overrides
-                                                                                                                                                                  WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                                                                                                                                  GROUP BY person_distinct_id_overrides.distinct_id
-                                                                                                                                                                  HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                                                                                                                               WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                                                                                                                                         WHERE ifNull(equals(step_0, 1), 0)
-                                                                                                                                                         UNION ALL SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                                                                                                                                         FROM
-                                                                                                                                                           (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                   ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                                                                                                                ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                                                                                                                            FROM
-                                                                                                                                                              (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step three'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step one'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step two'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                                                                                                                               FROM events AS e
-                                                                                                                                                               LEFT OUTER JOIN
-                                                                                                                                                                 (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                                                                                                                                  FROM person_distinct_id_overrides
-                                                                                                                                                                  WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                                                                                                                                  GROUP BY person_distinct_id_overrides.distinct_id
-                                                                                                                                                                  HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                                                                                                                               WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                                                                                                                                         WHERE ifNull(equals(step_0, 1), 0)))
-                                                                                                                                                   GROUP BY aggregation_target, steps
-                                                                                                                                                   HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                                                                                                                                                 and isNull(max(max_steps)))) AS step_runs
-                                                                                                                                                WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params)),
-                                                                                                                                      (SELECT histogram_params.bin_width_seconds AS bin_width_seconds
-                                                                                                                                       FROM
-                                                                                                                                         (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                                                                                                                                          FROM
-                                                                                                                                            (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                                                                                                                                             FROM
-                                                                                                                                               (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                                                                                                                                                FROM
-                                                                                                                                                  (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                                                                                                                                   FROM
-                                                                                                                                                     (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                             ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                                                                                                          ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                                                                                                                      FROM
-                                                                                                                                                        (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                                                                                                                         FROM events AS e
-                                                                                                                                                         LEFT OUTER JOIN
-                                                                                                                                                           (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                                                                                                                            FROM person_distinct_id_overrides
-                                                                                                                                                            WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                                                                                                                            GROUP BY person_distinct_id_overrides.distinct_id
-                                                                                                                                                            HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                                                                                                                         WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                                                                                                                                   WHERE ifNull(equals(step_0, 1), 0)
-                                                                                                                                                   UNION ALL SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                                                                                                                                   FROM
-                                                                                                                                                     (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                             ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                                                                                                          ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                                                                                                                      FROM
-                                                                                                                                                        (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step two'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step three'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step one'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                                                                                                                         FROM events AS e
-                                                                                                                                                         LEFT OUTER JOIN
-                                                                                                                                                           (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                                                                                                                            FROM person_distinct_id_overrides
-                                                                                                                                                            WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                                                                                                                            GROUP BY person_distinct_id_overrides.distinct_id
-                                                                                                                                                            HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                                                                                                                         WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                                                                                                                                   WHERE ifNull(equals(step_0, 1), 0)
-                                                                                                                                                   UNION ALL SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                                                                                                                                   FROM
-                                                                                                                                                     (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                             ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                                                                                                          ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                                                                                                                      FROM
-                                                                                                                                                        (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step three'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step one'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step two'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                                                                                                                         FROM events AS e
-                                                                                                                                                         LEFT OUTER JOIN
-                                                                                                                                                           (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                                                                                                                            FROM person_distinct_id_overrides
-                                                                                                                                                            WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                                                                                                                            GROUP BY person_distinct_id_overrides.distinct_id
-                                                                                                                                                            HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                                                                                                                         WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                                                                                                                                   WHERE ifNull(equals(step_0, 1), 0)))
-                                                                                                                                             GROUP BY aggregation_target, steps
-                                                                                                                                             HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                                                                                                                                           and isNull(max(max_steps)))) AS step_runs
-                                                                                                                                          WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params))),
-                                                                                                                         (SELECT histogram_params.bin_width_seconds AS bin_width_seconds
-                                                                                                                          FROM
-                                                                                                                            (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                                                                                                                             FROM
-                                                                                                                               (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                                                                                                                                FROM
-                                                                                                                                  (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                                                                                                                                   FROM
-                                                                                                                                     (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                                                                                                                      FROM
-                                                                                                                                        (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                                                                                             ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                                                                                                         FROM
-                                                                                                                                           (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                                                                                                            FROM events AS e
-                                                                                                                                            LEFT OUTER JOIN
-                                                                                                                                              (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                                                                                                               FROM person_distinct_id_overrides
-                                                                                                                                               WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                                                                                                               GROUP BY person_distinct_id_overrides.distinct_id
-                                                                                                                                               HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                                                                                                            WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                                                                                                                      WHERE ifNull(equals(step_0, 1), 0)
-                                                                                                                                      UNION ALL SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                                                                                                                      FROM
-                                                                                                                                        (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                                                                                             ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                                                                                                         FROM
-                                                                                                                                           (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step two'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step three'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step one'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                                                                                                            FROM events AS e
-                                                                                                                                            LEFT OUTER JOIN
-                                                                                                                                              (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                                                                                                               FROM person_distinct_id_overrides
-                                                                                                                                               WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                                                                                                               GROUP BY person_distinct_id_overrides.distinct_id
-                                                                                                                                               HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                                                                                                            WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                                                                                                                      WHERE ifNull(equals(step_0, 1), 0)
-                                                                                                                                      UNION ALL SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                                                                                                                      FROM
-                                                                                                                                        (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                                                                                             ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                                                                                                         FROM
-                                                                                                                                           (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step three'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step one'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step two'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                                                                                                            FROM events AS e
-                                                                                                                                            LEFT OUTER JOIN
-                                                                                                                                              (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                                                                                                               FROM person_distinct_id_overrides
-                                                                                                                                               WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                                                                                                               GROUP BY person_distinct_id_overrides.distinct_id
-                                                                                                                                               HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                                                                                                            WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                                                                                                                      WHERE ifNull(equals(step_0, 1), 0)))
-                                                                                                                                GROUP BY aggregation_target, steps
-                                                                                                                                HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                                                                                                                              and isNull(max(max_steps)))) AS step_runs
-                                                                                                                             WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params))) AS bin_from_seconds,
-            count() AS person_count
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               steps AS steps,
-               avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
-               avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
-               median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
-               median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  max(steps) OVER (PARTITION BY aggregation_target) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  step_2_conversion_time AS step_2_conversion_time
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     step_2 AS step_2,
-                     latest_2 AS latest_2,
-                     arraySort([latest_0, latest_1, latest_2]) AS event_times,
-                     arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                     arraySort([latest_0, latest_1, latest_2]) AS conversion_times,
-                     if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time,
-                     if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           step_2 AS step_2,
-                                           min(latest_2) OVER (PARTITION BY aggregation_target
-                                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                 FROM
-                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                           if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                           if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                           if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                           if(equals(e.event, 'step three'), 1, 0) AS step_2,
-                           if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                    FROM events AS e
-                    LEFT OUTER JOIN
-                      (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                              person_distinct_id_overrides.distinct_id AS distinct_id
-                       FROM person_distinct_id_overrides
-                       WHERE equals(person_distinct_id_overrides.team_id, 2)
-                       GROUP BY person_distinct_id_overrides.distinct_id
-                       HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                    WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-              WHERE ifNull(equals(step_0, 1), 0)
-              UNION ALL SELECT aggregation_target AS aggregation_target,
-                               timestamp AS timestamp,
-                               step_0 AS step_0,
-                               latest_0 AS latest_0,
-                               step_1 AS step_1,
-                               latest_1 AS latest_1,
-                               step_2 AS step_2,
-                               latest_2 AS latest_2,
-                               arraySort([latest_0, latest_1, latest_2]) AS event_times,
-                               arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                               arraySort([latest_0, latest_1, latest_2]) AS conversion_times,
-                               if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time,
-                               if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           step_2 AS step_2,
-                                           min(latest_2) OVER (PARTITION BY aggregation_target
-                                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                 FROM
-                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                           if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                           if(equals(e.event, 'step two'), 1, 0) AS step_0,
-                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                           if(equals(e.event, 'step three'), 1, 0) AS step_1,
-                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                           if(equals(e.event, 'step one'), 1, 0) AS step_2,
-                           if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                    FROM events AS e
-                    LEFT OUTER JOIN
-                      (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                              person_distinct_id_overrides.distinct_id AS distinct_id
-                       FROM person_distinct_id_overrides
-                       WHERE equals(person_distinct_id_overrides.team_id, 2)
-                       GROUP BY person_distinct_id_overrides.distinct_id
-                       HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                    WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-              WHERE ifNull(equals(step_0, 1), 0)
-              UNION ALL SELECT aggregation_target AS aggregation_target,
-                               timestamp AS timestamp,
-                               step_0 AS step_0,
-                               latest_0 AS latest_0,
-                               step_1 AS step_1,
-                               latest_1 AS latest_1,
-                               step_2 AS step_2,
-                               latest_2 AS latest_2,
-                               arraySort([latest_0, latest_1, latest_2]) AS event_times,
-                               arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                               arraySort([latest_0, latest_1, latest_2]) AS conversion_times,
-                               if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time,
-                               if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           step_2 AS step_2,
-                                           min(latest_2) OVER (PARTITION BY aggregation_target
-                                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                 FROM
-                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                           if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                           if(equals(e.event, 'step three'), 1, 0) AS step_0,
-                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                           if(equals(e.event, 'step one'), 1, 0) AS step_1,
-                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                           if(equals(e.event, 'step two'), 1, 0) AS step_2,
-                           if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                    FROM events AS e
-                    LEFT OUTER JOIN
-                      (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                              person_distinct_id_overrides.distinct_id AS distinct_id
-                       FROM person_distinct_id_overrides
-                       WHERE equals(person_distinct_id_overrides.team_id, 2)
-                       GROUP BY person_distinct_id_overrides.distinct_id
-                       HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                    WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps)))) AS step_runs
-     GROUP BY bin_from_seconds) AS results
-  RIGHT OUTER JOIN
-    (SELECT plus(
-                   (SELECT histogram_params.from_seconds AS from_seconds
-                    FROM
-                      (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                       FROM
-                         (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                          FROM
-                            (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                             FROM
-                               (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                FROM
-                                  (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                          ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                       ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                   FROM
-                                     (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                      FROM events AS e
-                                      LEFT OUTER JOIN
-                                        (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                         FROM person_distinct_id_overrides
-                                         WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                         GROUP BY person_distinct_id_overrides.distinct_id
-                                         HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                      WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                WHERE ifNull(equals(step_0, 1), 0)
-                                UNION ALL SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                FROM
-                                  (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                          ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                       ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                   FROM
-                                     (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step two'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step three'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step one'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                      FROM events AS e
-                                      LEFT OUTER JOIN
-                                        (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                         FROM person_distinct_id_overrides
-                                         WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                         GROUP BY person_distinct_id_overrides.distinct_id
-                                         HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                      WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                WHERE ifNull(equals(step_0, 1), 0)
-                                UNION ALL SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                FROM
-                                  (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                          ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                       ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                   FROM
-                                     (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step three'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step one'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step two'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                      FROM events AS e
-                                      LEFT OUTER JOIN
-                                        (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                         FROM person_distinct_id_overrides
-                                         WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                         GROUP BY person_distinct_id_overrides.distinct_id
-                                         HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                      WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                WHERE ifNull(equals(step_0, 1), 0)))
-                          GROUP BY aggregation_target, steps
-                          HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                        and isNull(max(max_steps)))) AS step_runs
-                       WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params), multiply(numbers.number,
-                                                                                                                         (SELECT histogram_params.bin_width_seconds AS bin_width_seconds
-                                                                                                                          FROM
-                                                                                                                            (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                                                                                                                             FROM
-                                                                                                                               (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                                                                                                                                FROM
-                                                                                                                                  (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                                                                                                                                   FROM
-                                                                                                                                     (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                                                                                                                      FROM
-                                                                                                                                        (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                                                                                             ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                                                                                                         FROM
-                                                                                                                                           (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                                                                                                            FROM events AS e
-                                                                                                                                            LEFT OUTER JOIN
-                                                                                                                                              (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                                                                                                               FROM person_distinct_id_overrides
-                                                                                                                                               WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                                                                                                               GROUP BY person_distinct_id_overrides.distinct_id
-                                                                                                                                               HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                                                                                                            WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                                                                                                                      WHERE ifNull(equals(step_0, 1), 0)
-                                                                                                                                      UNION ALL SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                                                                                                                      FROM
-                                                                                                                                        (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                                                                                             ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                                                                                                         FROM
-                                                                                                                                           (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step two'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step three'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step one'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                                                                                                            FROM events AS e
-                                                                                                                                            LEFT OUTER JOIN
-                                                                                                                                              (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                                                                                                               FROM person_distinct_id_overrides
-                                                                                                                                               WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                                                                                                               GROUP BY person_distinct_id_overrides.distinct_id
-                                                                                                                                               HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                                                                                                            WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                                                                                                                      WHERE ifNull(equals(step_0, 1), 0)
-                                                                                                                                      UNION ALL SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                                                                                                                      FROM
-                                                                                                                                        (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                                                                                                             ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                                                                                                         FROM
-                                                                                                                                           (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step three'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step one'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step two'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                                                                                                            FROM events AS e
-                                                                                                                                            LEFT OUTER JOIN
-                                                                                                                                              (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                                                                                                               FROM person_distinct_id_overrides
-                                                                                                                                               WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                                                                                                               GROUP BY person_distinct_id_overrides.distinct_id
-                                                                                                                                               HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                                                                                                            WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                                                                                                                      WHERE ifNull(equals(step_0, 1), 0)))
-                                                                                                                                GROUP BY aggregation_target, steps
-                                                                                                                                HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                                                                                                                              and isNull(max(max_steps)))) AS step_runs
-                                                                                                                             WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params))) AS bin_from_seconds
-     FROM numbers(plus(ifNull(
-                                (SELECT histogram_params.bin_count AS bin_count
-                                 FROM
-                                   (SELECT ifNull(floor(min(step_runs.step_1_average_conversion_time_inner)), 0) AS from_seconds, ifNull(ceil(max(step_runs.step_1_average_conversion_time_inner)), 1) AS to_seconds, round(avg(step_runs.step_1_average_conversion_time_inner), 2) AS average_conversion_time, count() AS sample_count, least(60, greatest(1, ceil(cbrt(ifNull(sample_count, 0))))) AS bin_count, ceil(divide(minus(to_seconds, from_seconds), bin_count)) AS bin_width_seconds_raw, if(ifNull(greater(bin_width_seconds_raw, 0), 0), bin_width_seconds_raw, 60) AS bin_width_seconds
-                                    FROM
-                                      (SELECT aggregation_target AS aggregation_target, steps AS steps, avg(step_1_conversion_time) AS step_1_average_conversion_time_inner, avg(step_2_conversion_time) AS step_2_average_conversion_time_inner, median(step_1_conversion_time) AS step_1_median_conversion_time_inner, median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-                                       FROM
-                                         (SELECT aggregation_target AS aggregation_target, steps AS steps, max(steps) OVER (PARTITION BY aggregation_target) AS max_steps, step_1_conversion_time AS step_1_conversion_time, step_2_conversion_time AS step_2_conversion_time
-                                          FROM
-                                            (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                             FROM
-                                               (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                       ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                    ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                FROM
-                                                  (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step one'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step two'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step three'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                   FROM events AS e
-                                                   LEFT OUTER JOIN
-                                                     (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                      FROM person_distinct_id_overrides
-                                                      WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                      GROUP BY person_distinct_id_overrides.distinct_id
-                                                      HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                   WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                             WHERE ifNull(equals(step_0, 1), 0)
-                                             UNION ALL SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                             FROM
-                                               (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                       ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                    ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                FROM
-                                                  (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step two'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step three'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step one'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                   FROM events AS e
-                                                   LEFT OUTER JOIN
-                                                     (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                      FROM person_distinct_id_overrides
-                                                      WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                      GROUP BY person_distinct_id_overrides.distinct_id
-                                                      HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                   WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                             WHERE ifNull(equals(step_0, 1), 0)
-                                             UNION ALL SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, latest_1 AS latest_1, step_2 AS step_2, latest_2 AS latest_2, arraySort([latest_0, latest_1, latest_2]) AS event_times, arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps, arraySort([latest_0, latest_1, latest_2]) AS conversion_times, if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time, if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-                                             FROM
-                                               (SELECT aggregation_target AS aggregation_target, timestamp AS timestamp, step_0 AS step_0, latest_0 AS latest_0, step_1 AS step_1, min(latest_1) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                       ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1, step_2 AS step_2, min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                                                                                                    ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                                                FROM
-                                                  (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp, if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target, if(equals(e.event, 'step three'), 1, 0) AS step_0, if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0, if(equals(e.event, 'step one'), 1, 0) AS step_1, if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1, if(equals(e.event, 'step two'), 1, 0) AS step_2, if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                                                   FROM events AS e
-                                                   LEFT OUTER JOIN
-                                                     (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id, person_distinct_id_overrides.distinct_id AS distinct_id
-                                                      FROM person_distinct_id_overrides
-                                                      WHERE equals(person_distinct_id_overrides.team_id, 2)
-                                                      GROUP BY person_distinct_id_overrides.distinct_id
-                                                      HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                                                   WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-07 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-06-13 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-                                             WHERE ifNull(equals(step_0, 1), 0)))
-                                       GROUP BY aggregation_target, steps
-                                       HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                                                     and isNull(max(max_steps)))) AS step_runs
-                                    WHERE isNotNull(step_runs.step_1_average_conversion_time_inner)) AS histogram_params), 0), 1)) AS numbers) AS fill ON equals(results.bin_from_seconds, fill.bin_from_seconds)
-  ORDER BY fill.bin_from_seconds ASC
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
diff --git a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_trends.ambr b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_trends.ambr
deleted file mode 100644
index a8ce810a87cfd..0000000000000
--- a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_trends.ambr
+++ /dev/null
@@ -1,363 +0,0 @@
-# serializer version: 1
-# name: TestFunnelTrends.test_timezones_trends
-  '''
-  SELECT fill.entrance_period_start AS entrance_period_start,
-         data.reached_from_step_count AS reached_from_step_count,
-         data.reached_to_step_count AS reached_to_step_count,
-         if(ifNull(greater(data.reached_from_step_count, 0), 0), round(multiply(divide(data.reached_to_step_count, data.reached_from_step_count), 100), 2), 0) AS conversion_rate
-  FROM
-    (SELECT plus(toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull(('2021-04-30 00:00:00'), 6, 'UTC'))), toIntervalDay(period_offsets.number)) AS entrance_period_start
-     FROM numbers(plus(dateDiff('day', toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull(('2021-04-30 00:00:00'), 6, 'UTC'))), toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull(('2021-05-07 23:59:59'), 6, 'UTC')))), 1)) AS period_offsets) AS fill
-  LEFT OUTER JOIN
-    (SELECT entrance_period_start AS entrance_period_start,
-            countIf(ifNull(greaterOrEquals(steps_completed, 1), 0)) AS reached_from_step_count,
-            countIf(ifNull(greaterOrEquals(steps_completed, 3), 0)) AS reached_to_step_count
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               toStartOfDay(timestamp) AS entrance_period_start,
-               max(steps) AS steps_completed
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  timestamp AS timestamp,
-                  step_0 AS step_0,
-                  latest_0 AS latest_0,
-                  step_1 AS step_1,
-                  latest_1 AS latest_1,
-                  step_2 AS step_2,
-                  latest_2 AS latest_2,
-                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps,
-                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
-                  if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     step_2 AS step_2,
-                     min(latest_2) OVER (PARTITION BY aggregation_target
-                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        latest_1 AS latest_1,
-                        step_2 AS step_2,
-                        if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2
-                 FROM
-                   (SELECT aggregation_target AS aggregation_target,
-                           timestamp AS timestamp,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           min(latest_1) OVER (PARTITION BY aggregation_target
-                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                              step_2 AS step_2,
-                                              min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(equals(e.event, 'step three'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-04-30 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-05-07 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
-           WHERE ifNull(equals(step_0, 1), 0))
-        GROUP BY aggregation_target,
-                 entrance_period_start)
-     GROUP BY entrance_period_start) AS data ON equals(data.entrance_period_start, fill.entrance_period_start)
-  ORDER BY fill.entrance_period_start ASC
-  LIMIT 1000 SETTINGS readonly=2,
-                      max_execution_time=60,
-                      allow_experimental_object_type=1,
-                      format_csv_allow_double_quotes=0,
-                      max_ast_elements=4000000,
-                      max_expanded_ast_elements=4000000,
-                      max_bytes_before_external_group_by=23622320128,
-                      allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelTrends.test_timezones_trends.1
-  '''
-  SELECT fill.entrance_period_start AS entrance_period_start,
-         data.reached_from_step_count AS reached_from_step_count,
-         data.reached_to_step_count AS reached_to_step_count,
-         if(ifNull(greater(data.reached_from_step_count, 0), 0), round(multiply(divide(data.reached_to_step_count, data.reached_from_step_count), 100), 2), 0) AS conversion_rate
-  FROM
-    (SELECT plus(toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull(('2021-04-30 00:00:00'), 6, 'US/Pacific'))), toIntervalDay(period_offsets.number)) AS entrance_period_start
-     FROM numbers(plus(dateDiff('day', toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull(('2021-04-30 00:00:00'), 6, 'US/Pacific'))), toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull(('2021-05-07 23:59:59'), 6, 'US/Pacific')))), 1)) AS period_offsets) AS fill
-  LEFT OUTER JOIN
-    (SELECT entrance_period_start AS entrance_period_start,
-            countIf(ifNull(greaterOrEquals(steps_completed, 1), 0)) AS reached_from_step_count,
-            countIf(ifNull(greaterOrEquals(steps_completed, 3), 0)) AS reached_to_step_count
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               toStartOfDay(timestamp) AS entrance_period_start,
-               max(steps) AS steps_completed
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  timestamp AS timestamp,
-                  step_0 AS step_0,
-                  latest_0 AS latest_0,
-                  step_1 AS step_1,
-                  latest_1 AS latest_1,
-                  step_2 AS step_2,
-                  latest_2 AS latest_2,
-                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps,
-                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
-                  if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     step_2 AS step_2,
-                     min(latest_2) OVER (PARTITION BY aggregation_target
-                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        latest_1 AS latest_1,
-                        step_2 AS step_2,
-                        if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2
-                 FROM
-                   (SELECT aggregation_target AS aggregation_target,
-                           timestamp AS timestamp,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           min(latest_1) OVER (PARTITION BY aggregation_target
-                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                              step_2 AS step_2,
-                                              min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'US/Pacific') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(equals(e.event, 'step three'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'US/Pacific'), toDateTime64('2021-04-30 00:00:00.000000', 6, 'US/Pacific')), lessOrEquals(toTimeZone(e.timestamp, 'US/Pacific'), toDateTime64('2021-05-07 23:59:59.999999', 6, 'US/Pacific'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
-           WHERE ifNull(equals(step_0, 1), 0))
-        GROUP BY aggregation_target,
-                 entrance_period_start)
-     GROUP BY entrance_period_start) AS data ON equals(data.entrance_period_start, fill.entrance_period_start)
-  ORDER BY fill.entrance_period_start ASC
-  LIMIT 1000 SETTINGS readonly=2,
-                      max_execution_time=60,
-                      allow_experimental_object_type=1,
-                      format_csv_allow_double_quotes=0,
-                      max_ast_elements=4000000,
-                      max_expanded_ast_elements=4000000,
-                      max_bytes_before_external_group_by=23622320128,
-                      allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelTrends.test_week_interval
-  '''
-  SELECT fill.entrance_period_start AS entrance_period_start,
-         data.reached_from_step_count AS reached_from_step_count,
-         data.reached_to_step_count AS reached_to_step_count,
-         if(ifNull(greater(data.reached_from_step_count, 0), 0), round(multiply(divide(data.reached_to_step_count, data.reached_from_step_count), 100), 2), 0) AS conversion_rate
-  FROM
-    (SELECT plus(toStartOfWeek(assumeNotNull(parseDateTime64BestEffortOrNull(('2021-05-01 00:00:00'), 6, 'UTC')), 0), toIntervalWeek(period_offsets.number)) AS entrance_period_start
-     FROM numbers(plus(dateDiff('week', toStartOfWeek(assumeNotNull(parseDateTime64BestEffortOrNull(('2021-05-01 00:00:00'), 6, 'UTC')), 0), toStartOfWeek(assumeNotNull(parseDateTime64BestEffortOrNull(('2021-05-07 23:59:59'), 6, 'UTC')), 0)), 1)) AS period_offsets) AS fill
-  LEFT OUTER JOIN
-    (SELECT entrance_period_start AS entrance_period_start,
-            countIf(ifNull(greaterOrEquals(steps_completed, 1), 0)) AS reached_from_step_count,
-            countIf(ifNull(greaterOrEquals(steps_completed, 3), 0)) AS reached_to_step_count
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               toStartOfWeek(timestamp, 0) AS entrance_period_start,
-               max(steps) AS steps_completed
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  timestamp AS timestamp,
-                  step_0 AS step_0,
-                  latest_0 AS latest_0,
-                  step_1 AS step_1,
-                  latest_1 AS latest_1,
-                  step_2 AS step_2,
-                  latest_2 AS latest_2,
-                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps,
-                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
-                  if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     step_2 AS step_2,
-                     min(latest_2) OVER (PARTITION BY aggregation_target
-                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        latest_1 AS latest_1,
-                        step_2 AS step_2,
-                        if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2
-                 FROM
-                   (SELECT aggregation_target AS aggregation_target,
-                           timestamp AS timestamp,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           min(latest_1) OVER (PARTITION BY aggregation_target
-                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                              step_2 AS step_2,
-                                              min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(equals(e.event, 'step three'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-05-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-05-07 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
-           WHERE ifNull(equals(step_0, 1), 0))
-        GROUP BY aggregation_target,
-                 entrance_period_start)
-     GROUP BY entrance_period_start) AS data ON equals(data.entrance_period_start, fill.entrance_period_start)
-  ORDER BY fill.entrance_period_start ASC
-  LIMIT 1000 SETTINGS readonly=2,
-                      max_execution_time=60,
-                      allow_experimental_object_type=1,
-                      format_csv_allow_double_quotes=0,
-                      max_ast_elements=4000000,
-                      max_expanded_ast_elements=4000000,
-                      max_bytes_before_external_group_by=23622320128,
-                      allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelTrends.test_week_interval.1
-  '''
-  
-  SELECT aggregation_target AS actor_id
-  FROM
-    (SELECT aggregation_target,
-            toStartOfWeek(toTimeZone(toDateTime(timestamp, 'UTC'), 'UTC'), 0) AS entrance_period_start,
-            max(steps) AS steps_completed
-     FROM
-       (SELECT *,
-               if(latest_0 <= latest_1
-                  AND latest_1 <= latest_0 + INTERVAL 7 DAY
-                  AND latest_1 <= latest_2
-                  AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
-                                                                   AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps ,
-               if(isNotNull(latest_1)
-                  AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
-               if(isNotNull(latest_2)
-                  AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time
-        FROM
-          (SELECT aggregation_target, timestamp, step_0,
-                                                 latest_0,
-                                                 step_1,
-                                                 latest_1,
-                                                 step_2,
-                                                 min(latest_2) over (PARTITION by aggregation_target
-                                                                     ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    latest_1,
-                                                    step_2,
-                                                    if(latest_2 < latest_1, NULL, latest_2) as latest_2
-              FROM
-                (SELECT aggregation_target, timestamp, step_0,
-                                                       latest_0,
-                                                       step_1,
-                                                       min(latest_1) over (PARTITION by aggregation_target
-                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
-                                                                          step_2,
-                                                                          min(latest_2) over (PARTITION by aggregation_target
-                                                                                              ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'step one', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'step two', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'step three', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND event IN ['step one', 'step three', 'step two']
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2021-05-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2021-05-07 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    WHERE team_id = 2
-                      AND event IN ['step one', 'step three', 'step two']
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2021-05-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2021-05-07 23:59:59', 'UTC')
-                      AND (step_0 = 1
-                           OR step_1 = 1
-                           OR step_2 = 1) ))))
-        WHERE step_0 = 1 )
-     WHERE toDateTime(entrance_period_start) = '2021-04-25 00:00:00'
-     GROUP BY aggregation_target,
-              entrance_period_start)
-  WHERE steps_completed >= 3
-  ORDER BY aggregation_target
-  LIMIT 100
-  OFFSET 0 SETTINGS max_ast_elements=1000000,
-                    max_expanded_ast_elements=1000000
-  '''
-# ---
diff --git a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_trends_persons.ambr b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_trends_persons.ambr
deleted file mode 100644
index cdfb24412bf92..0000000000000
--- a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_trends_persons.ambr
+++ /dev/null
@@ -1,520 +0,0 @@
-# serializer version: 1
-# name: TestFunnelTrendsPersons.test_funnel_trend_persons_returns_recordings
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         source.matching_events AS matching_events
-  FROM
-    (SELECT aggregation_target AS actor_id,
-            step_1_matching_events AS matching_events
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               toStartOfDay(timestamp) AS entrance_period_start,
-               max(steps) AS steps_completed,
-               groupArray(10)(step_0_matching_event) AS step_0_matching_events,
-               groupArray(10)(step_1_matching_event) AS step_1_matching_events,
-               groupArray(10)(step_2_matching_event) AS step_2_matching_events,
-               groupArray(10)(final_matching_event) AS final_matching_events
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  timestamp AS timestamp,
-                  step_0 AS step_0,
-                  latest_0 AS latest_0,
-                  uuid_0 AS uuid_0,
-                  `$session_id_0` AS `$session_id_0`,
-                  `$window_id_0` AS `$window_id_0`,
-                  step_1 AS step_1,
-                  latest_1 AS latest_1,
-                  uuid_1 AS uuid_1,
-                  `$session_id_1` AS `$session_id_1`,
-                  `$window_id_1` AS `$window_id_1`,
-                  step_2 AS step_2,
-                  latest_2 AS latest_2,
-                  uuid_2 AS uuid_2,
-                  `$session_id_2` AS `$session_id_2`,
-                  `$window_id_2` AS `$window_id_2`,
-                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps,
-                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
-                  if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time,
-                  tuple(latest_0, uuid_0, `$session_id_0`, `$window_id_0`) AS step_0_matching_event,
-                  tuple(latest_1, uuid_1, `$session_id_1`, `$window_id_1`) AS step_1_matching_event,
-                  tuple(latest_2, uuid_2, `$session_id_2`, `$window_id_2`) AS step_2_matching_event,
-                  if(isNull(latest_0), tuple(NULL, NULL, NULL, NULL), if(isNull(latest_1), step_0_matching_event, if(isNull(latest_2), step_1_matching_event, step_2_matching_event))) AS final_matching_event
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     uuid_0 AS uuid_0,
-                     `$session_id_0` AS `$session_id_0`,
-                     `$window_id_0` AS `$window_id_0`,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     uuid_1 AS uuid_1,
-                     `$session_id_1` AS `$session_id_1`,
-                     `$window_id_1` AS `$window_id_1`,
-                     step_2 AS step_2,
-                     min(latest_2) OVER (PARTITION BY aggregation_target
-                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                        last_value(uuid_2) OVER (PARTITION BY aggregation_target
-                                                                 ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_2,
-                                                                last_value(`$session_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_2`,
-                                                                                                 last_value(`$window_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_2`
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        uuid_0 AS uuid_0,
-                        `$session_id_0` AS `$session_id_0`,
-                        `$window_id_0` AS `$window_id_0`,
-                        step_1 AS step_1,
-                        latest_1 AS latest_1,
-                        uuid_1 AS uuid_1,
-                        `$session_id_1` AS `$session_id_1`,
-                        `$window_id_1` AS `$window_id_1`,
-                        step_2 AS step_2,
-                        if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2,
-                        if(ifNull(less(latest_2, latest_1), 0), NULL, uuid_2) AS uuid_2,
-                        if(ifNull(less(latest_2, latest_1), 0), NULL, `$session_id_2`) AS `$session_id_2`,
-                        if(ifNull(less(latest_2, latest_1), 0), NULL, `$window_id_2`) AS `$window_id_2`
-                 FROM
-                   (SELECT aggregation_target AS aggregation_target,
-                           timestamp AS timestamp,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           uuid_0 AS uuid_0,
-                           `$session_id_0` AS `$session_id_0`,
-                           `$window_id_0` AS `$window_id_0`,
-                           step_1 AS step_1,
-                           min(latest_1) OVER (PARTITION BY aggregation_target
-                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                              last_value(uuid_1) OVER (PARTITION BY aggregation_target
-                                                                       ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_1,
-                                                                      last_value(`$session_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_1`,
-                                                                                                       last_value(`$window_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_1`,
-                                                                                                                                       step_2 AS step_2,
-                                                                                                                                       min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                                                                                                                                          last_value(uuid_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                   ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_2,
-                                                                                                                                                                                  last_value(`$session_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                    ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_2`,
-                                                                                                                                                                                                                   last_value(`$window_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                    ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_2`
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              e.uuid AS uuid,
-                              if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(ifNull(equals(step_0, 1), 0), uuid, NULL) AS uuid_0,
-                              if(ifNull(equals(step_0, 1), 0), e.`$session_id`, NULL) AS `$session_id_0`,
-                              if(ifNull(equals(step_0, 1), 0), e.`$window_id`, NULL) AS `$window_id_0`,
-                              if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(ifNull(equals(step_1, 1), 0), uuid, NULL) AS uuid_1,
-                              if(ifNull(equals(step_1, 1), 0), e.`$session_id`, NULL) AS `$session_id_1`,
-                              if(ifNull(equals(step_1, 1), 0), e.`$window_id`, NULL) AS `$window_id_1`,
-                              if(equals(e.event, 'step three'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                              if(ifNull(equals(step_2, 1), 0), uuid, NULL) AS uuid_2,
-                              if(ifNull(equals(step_2, 1), 0), e.`$session_id`, NULL) AS `$session_id_2`,
-                              if(ifNull(equals(step_2, 1), 0), e.`$window_id`, NULL) AS `$window_id_2`
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-05-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-05-07 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
-           WHERE ifNull(equals(step_0, 1), 0))
-        WHERE ifNull(equals(entrance_period_start, toDateTime64('2021-05-01 00:00:00.000000', 6, 'UTC')), 0)
-        GROUP BY aggregation_target,
-                 entrance_period_start)
-     WHERE ifNull(greaterOrEquals(steps_completed, 2), 0)
-     ORDER BY aggregation_target ASC) AS source
-  INNER JOIN
-    (SELECT person.id AS id
-     FROM person
-     WHERE equals(person.team_id, 2)
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0,
-                    allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelTrendsPersons.test_funnel_trend_persons_returns_recordings.1
-  '''
-  SELECT DISTINCT session_replay_events.session_id AS session_id
-  FROM session_replay_events
-  WHERE and(equals(session_replay_events.team_id, 2), ifNull(greaterOrEquals(toTimeZone(session_replay_events.min_first_timestamp, 'UTC'), minus(toDateTime64('2021-05-01 00:00:00.000000', 6, 'UTC'), toIntervalDay(21))), 0), in(session_replay_events.session_id, ['s1b']))
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestFunnelTrendsPersons.test_funnel_trend_persons_with_drop_off
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         source.matching_events AS matching_events
-  FROM
-    (SELECT aggregation_target AS actor_id,
-            final_matching_events AS matching_events
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               toStartOfDay(timestamp) AS entrance_period_start,
-               max(steps) AS steps_completed,
-               groupArray(10)(step_0_matching_event) AS step_0_matching_events,
-               groupArray(10)(step_1_matching_event) AS step_1_matching_events,
-               groupArray(10)(step_2_matching_event) AS step_2_matching_events,
-               groupArray(10)(final_matching_event) AS final_matching_events
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  timestamp AS timestamp,
-                  step_0 AS step_0,
-                  latest_0 AS latest_0,
-                  uuid_0 AS uuid_0,
-                  `$session_id_0` AS `$session_id_0`,
-                  `$window_id_0` AS `$window_id_0`,
-                  step_1 AS step_1,
-                  latest_1 AS latest_1,
-                  uuid_1 AS uuid_1,
-                  `$session_id_1` AS `$session_id_1`,
-                  `$window_id_1` AS `$window_id_1`,
-                  step_2 AS step_2,
-                  latest_2 AS latest_2,
-                  uuid_2 AS uuid_2,
-                  `$session_id_2` AS `$session_id_2`,
-                  `$window_id_2` AS `$window_id_2`,
-                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps,
-                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
-                  if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time,
-                  tuple(latest_0, uuid_0, `$session_id_0`, `$window_id_0`) AS step_0_matching_event,
-                  tuple(latest_1, uuid_1, `$session_id_1`, `$window_id_1`) AS step_1_matching_event,
-                  tuple(latest_2, uuid_2, `$session_id_2`, `$window_id_2`) AS step_2_matching_event,
-                  if(isNull(latest_0), tuple(NULL, NULL, NULL, NULL), if(isNull(latest_1), step_0_matching_event, if(isNull(latest_2), step_1_matching_event, step_2_matching_event))) AS final_matching_event
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     uuid_0 AS uuid_0,
-                     `$session_id_0` AS `$session_id_0`,
-                     `$window_id_0` AS `$window_id_0`,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     uuid_1 AS uuid_1,
-                     `$session_id_1` AS `$session_id_1`,
-                     `$window_id_1` AS `$window_id_1`,
-                     step_2 AS step_2,
-                     min(latest_2) OVER (PARTITION BY aggregation_target
-                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                        last_value(uuid_2) OVER (PARTITION BY aggregation_target
-                                                                 ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_2,
-                                                                last_value(`$session_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_2`,
-                                                                                                 last_value(`$window_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_2`
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        uuid_0 AS uuid_0,
-                        `$session_id_0` AS `$session_id_0`,
-                        `$window_id_0` AS `$window_id_0`,
-                        step_1 AS step_1,
-                        latest_1 AS latest_1,
-                        uuid_1 AS uuid_1,
-                        `$session_id_1` AS `$session_id_1`,
-                        `$window_id_1` AS `$window_id_1`,
-                        step_2 AS step_2,
-                        if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2,
-                        if(ifNull(less(latest_2, latest_1), 0), NULL, uuid_2) AS uuid_2,
-                        if(ifNull(less(latest_2, latest_1), 0), NULL, `$session_id_2`) AS `$session_id_2`,
-                        if(ifNull(less(latest_2, latest_1), 0), NULL, `$window_id_2`) AS `$window_id_2`
-                 FROM
-                   (SELECT aggregation_target AS aggregation_target,
-                           timestamp AS timestamp,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           uuid_0 AS uuid_0,
-                           `$session_id_0` AS `$session_id_0`,
-                           `$window_id_0` AS `$window_id_0`,
-                           step_1 AS step_1,
-                           min(latest_1) OVER (PARTITION BY aggregation_target
-                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                              last_value(uuid_1) OVER (PARTITION BY aggregation_target
-                                                                       ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_1,
-                                                                      last_value(`$session_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_1`,
-                                                                                                       last_value(`$window_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_1`,
-                                                                                                                                       step_2 AS step_2,
-                                                                                                                                       min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                                                                                                                                          last_value(uuid_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                   ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_2,
-                                                                                                                                                                                  last_value(`$session_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                    ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_2`,
-                                                                                                                                                                                                                   last_value(`$window_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                    ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_2`
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              e.uuid AS uuid,
-                              if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(ifNull(equals(step_0, 1), 0), uuid, NULL) AS uuid_0,
-                              if(ifNull(equals(step_0, 1), 0), e.`$session_id`, NULL) AS `$session_id_0`,
-                              if(ifNull(equals(step_0, 1), 0), e.`$window_id`, NULL) AS `$window_id_0`,
-                              if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(ifNull(equals(step_1, 1), 0), uuid, NULL) AS uuid_1,
-                              if(ifNull(equals(step_1, 1), 0), e.`$session_id`, NULL) AS `$session_id_1`,
-                              if(ifNull(equals(step_1, 1), 0), e.`$window_id`, NULL) AS `$window_id_1`,
-                              if(equals(e.event, 'step three'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                              if(ifNull(equals(step_2, 1), 0), uuid, NULL) AS uuid_2,
-                              if(ifNull(equals(step_2, 1), 0), e.`$session_id`, NULL) AS `$session_id_2`,
-                              if(ifNull(equals(step_2, 1), 0), e.`$window_id`, NULL) AS `$window_id_2`
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-05-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-05-07 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
-           WHERE ifNull(equals(step_0, 1), 0))
-        WHERE ifNull(equals(entrance_period_start, toDateTime64('2021-05-01 00:00:00.000000', 6, 'UTC')), 0)
-        GROUP BY aggregation_target,
-                 entrance_period_start)
-     WHERE and(ifNull(greaterOrEquals(steps_completed, 1), 0), ifNull(less(steps_completed, 3), 0))
-     ORDER BY aggregation_target ASC) AS source
-  INNER JOIN
-    (SELECT person.id AS id
-     FROM person
-     WHERE equals(person.team_id, 2)
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0,
-                    allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelTrendsPersons.test_funnel_trend_persons_with_drop_off.1
-  '''
-  SELECT DISTINCT session_replay_events.session_id AS session_id
-  FROM session_replay_events
-  WHERE and(equals(session_replay_events.team_id, 2), ifNull(greaterOrEquals(toTimeZone(session_replay_events.min_first_timestamp, 'UTC'), minus(toDateTime64('2021-05-01 00:00:00.000000', 6, 'UTC'), toIntervalDay(21))), 0), in(session_replay_events.session_id, ['s1a']))
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
-# name: TestFunnelTrendsPersons.test_funnel_trend_persons_with_no_to_step
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         source.matching_events AS matching_events
-  FROM
-    (SELECT aggregation_target AS actor_id,
-            final_matching_events AS matching_events
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               toStartOfDay(timestamp) AS entrance_period_start,
-               max(steps) AS steps_completed,
-               groupArray(10)(step_0_matching_event) AS step_0_matching_events,
-               groupArray(10)(step_1_matching_event) AS step_1_matching_events,
-               groupArray(10)(step_2_matching_event) AS step_2_matching_events,
-               groupArray(10)(final_matching_event) AS final_matching_events
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  timestamp AS timestamp,
-                  step_0 AS step_0,
-                  latest_0 AS latest_0,
-                  uuid_0 AS uuid_0,
-                  `$session_id_0` AS `$session_id_0`,
-                  `$window_id_0` AS `$window_id_0`,
-                  step_1 AS step_1,
-                  latest_1 AS latest_1,
-                  uuid_1 AS uuid_1,
-                  `$session_id_1` AS `$session_id_1`,
-                  `$window_id_1` AS `$window_id_1`,
-                  step_2 AS step_2,
-                  latest_2 AS latest_2,
-                  uuid_2 AS uuid_2,
-                  `$session_id_2` AS `$session_id_2`,
-                  `$window_id_2` AS `$window_id_2`,
-                  if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0), ifNull(lessOrEquals(latest_1, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 3, if(and(ifNull(lessOrEquals(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 2, 1)) AS steps,
-                  if(and(isNotNull(latest_1), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_0, latest_1), NULL) AS step_1_conversion_time,
-                  if(and(isNotNull(latest_2), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_1, 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', latest_1, latest_2), NULL) AS step_2_conversion_time,
-                  tuple(latest_0, uuid_0, `$session_id_0`, `$window_id_0`) AS step_0_matching_event,
-                  tuple(latest_1, uuid_1, `$session_id_1`, `$window_id_1`) AS step_1_matching_event,
-                  tuple(latest_2, uuid_2, `$session_id_2`, `$window_id_2`) AS step_2_matching_event,
-                  if(isNull(latest_0), tuple(NULL, NULL, NULL, NULL), if(isNull(latest_1), step_0_matching_event, if(isNull(latest_2), step_1_matching_event, step_2_matching_event))) AS final_matching_event
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     uuid_0 AS uuid_0,
-                     `$session_id_0` AS `$session_id_0`,
-                     `$window_id_0` AS `$window_id_0`,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     uuid_1 AS uuid_1,
-                     `$session_id_1` AS `$session_id_1`,
-                     `$window_id_1` AS `$window_id_1`,
-                     step_2 AS step_2,
-                     min(latest_2) OVER (PARTITION BY aggregation_target
-                                         ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                        last_value(uuid_2) OVER (PARTITION BY aggregation_target
-                                                                 ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_2,
-                                                                last_value(`$session_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_2`,
-                                                                                                 last_value(`$window_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                  ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_2`
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        uuid_0 AS uuid_0,
-                        `$session_id_0` AS `$session_id_0`,
-                        `$window_id_0` AS `$window_id_0`,
-                        step_1 AS step_1,
-                        latest_1 AS latest_1,
-                        uuid_1 AS uuid_1,
-                        `$session_id_1` AS `$session_id_1`,
-                        `$window_id_1` AS `$window_id_1`,
-                        step_2 AS step_2,
-                        if(ifNull(less(latest_2, latest_1), 0), NULL, latest_2) AS latest_2,
-                        if(ifNull(less(latest_2, latest_1), 0), NULL, uuid_2) AS uuid_2,
-                        if(ifNull(less(latest_2, latest_1), 0), NULL, `$session_id_2`) AS `$session_id_2`,
-                        if(ifNull(less(latest_2, latest_1), 0), NULL, `$window_id_2`) AS `$window_id_2`
-                 FROM
-                   (SELECT aggregation_target AS aggregation_target,
-                           timestamp AS timestamp,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           uuid_0 AS uuid_0,
-                           `$session_id_0` AS `$session_id_0`,
-                           `$window_id_0` AS `$window_id_0`,
-                           step_1 AS step_1,
-                           min(latest_1) OVER (PARTITION BY aggregation_target
-                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                              last_value(uuid_1) OVER (PARTITION BY aggregation_target
-                                                                       ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_1,
-                                                                      last_value(`$session_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_1`,
-                                                                                                       last_value(`$window_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_1`,
-                                                                                                                                       step_2 AS step_2,
-                                                                                                                                       min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                                                                                                                                          last_value(uuid_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                   ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_2,
-                                                                                                                                                                                  last_value(`$session_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                    ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_2`,
-                                                                                                                                                                                                                   last_value(`$window_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                    ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_2`
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              e.uuid AS uuid,
-                              if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(ifNull(equals(step_0, 1), 0), uuid, NULL) AS uuid_0,
-                              if(ifNull(equals(step_0, 1), 0), e.`$session_id`, NULL) AS `$session_id_0`,
-                              if(ifNull(equals(step_0, 1), 0), e.`$window_id`, NULL) AS `$window_id_0`,
-                              if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(ifNull(equals(step_1, 1), 0), uuid, NULL) AS uuid_1,
-                              if(ifNull(equals(step_1, 1), 0), e.`$session_id`, NULL) AS `$session_id_1`,
-                              if(ifNull(equals(step_1, 1), 0), e.`$window_id`, NULL) AS `$window_id_1`,
-                              if(equals(e.event, 'step three'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                              if(ifNull(equals(step_2, 1), 0), uuid, NULL) AS uuid_2,
-                              if(ifNull(equals(step_2, 1), 0), e.`$session_id`, NULL) AS `$session_id_2`,
-                              if(ifNull(equals(step_2, 1), 0), e.`$window_id`, NULL) AS `$window_id_2`
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-05-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-05-07 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))))
-           WHERE ifNull(equals(step_0, 1), 0))
-        WHERE ifNull(equals(entrance_period_start, toDateTime64('2021-05-01 00:00:00.000000', 6, 'UTC')), 0)
-        GROUP BY aggregation_target,
-                 entrance_period_start)
-     WHERE ifNull(greaterOrEquals(steps_completed, 3), 0)
-     ORDER BY aggregation_target ASC) AS source
-  INNER JOIN
-    (SELECT person.id AS id
-     FROM person
-     WHERE equals(person.team_id, 2)
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0,
-                    allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelTrendsPersons.test_funnel_trend_persons_with_no_to_step.1
-  '''
-  SELECT DISTINCT session_replay_events.session_id AS session_id
-  FROM session_replay_events
-  WHERE and(equals(session_replay_events.team_id, 2), ifNull(greaterOrEquals(toTimeZone(session_replay_events.min_first_timestamp, 'UTC'), minus(toDateTime64('2021-05-01 00:00:00.000000', 6, 'UTC'), toIntervalDay(21))), 0), in(session_replay_events.session_id, ['s1c']))
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=0
-  '''
-# ---
diff --git a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_trends_udf.ambr b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_trends_udf.ambr
deleted file mode 100644
index dcfa7a1ef2754..0000000000000
--- a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_trends_udf.ambr
+++ /dev/null
@@ -1,225 +0,0 @@
-# serializer version: 1
-# name: TestFunnelTrendsUDF.test_timezones_trends
-  '''
-  SELECT fill.entrance_period_start AS entrance_period_start,
-         countIf(ifNull(notEquals(data.success_bool, 0), 1)) AS reached_from_step_count,
-         countIf(ifNull(equals(data.success_bool, 1), 0)) AS reached_to_step_count,
-         if(ifNull(greater(reached_from_step_count, 0), 0), round(multiply(divide(reached_to_step_count, reached_from_step_count), 100), 2), 0) AS conversion_rate,
-         data.breakdown AS prop
-  FROM
-    (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), toUInt64(toDateTime(toStartOfDay(timestamp), 'UTC')), [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-            arrayJoin(aggregate_funnel_array_trends_v0(0, 3, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-            toTimeZone(toDateTime(toUInt64(af_tuple.1), 'UTC'), 'UTC') AS entrance_period_start,
-            af_tuple.2 AS success_bool,
-            af_tuple.3 AS breakdown
-     FROM
-       (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-               if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-               if(equals(e.event, 'step one'), 1, 0) AS step_0,
-               if(equals(e.event, 'step two'), 1, 0) AS step_1,
-               if(equals(e.event, 'step three'), 1, 0) AS step_2
-        FROM events AS e
-        LEFT OUTER JOIN
-          (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                  person_distinct_id_overrides.distinct_id AS distinct_id
-           FROM person_distinct_id_overrides
-           WHERE equals(person_distinct_id_overrides.team_id, 2)
-           GROUP BY person_distinct_id_overrides.distinct_id
-           HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-        WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-04-30 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-05-07 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))
-     GROUP BY aggregation_target SETTINGS date_time_output_format='iso',
-                                          date_time_input_format='best_effort') AS data
-  RIGHT OUTER JOIN
-    (SELECT plus(toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull(('2021-04-30 00:00:00'), 6, 'UTC'))), toIntervalDay(period_offsets.number)) AS entrance_period_start
-     FROM numbers(plus(dateDiff('day', toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull(('2021-04-30 00:00:00'), 6, 'UTC'))), toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull(('2021-05-07 23:59:59'), 6, 'UTC')))), 1)) AS period_offsets) AS fill ON equals(data.entrance_period_start, fill.entrance_period_start)
-  GROUP BY entrance_period_start,
-           data.breakdown
-  ORDER BY entrance_period_start ASC
-  LIMIT 1000 SETTINGS readonly=2,
-                      max_execution_time=60,
-                      allow_experimental_object_type=1,
-                      format_csv_allow_double_quotes=0,
-                      max_ast_elements=4000000,
-                      max_expanded_ast_elements=4000000,
-                      max_bytes_before_external_group_by=23622320128,
-                      allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelTrendsUDF.test_timezones_trends.1
-  '''
-  SELECT fill.entrance_period_start AS entrance_period_start,
-         countIf(ifNull(notEquals(data.success_bool, 0), 1)) AS reached_from_step_count,
-         countIf(ifNull(equals(data.success_bool, 1), 0)) AS reached_to_step_count,
-         if(ifNull(greater(reached_from_step_count, 0), 0), round(multiply(divide(reached_to_step_count, reached_from_step_count), 100), 2), 0) AS conversion_rate,
-         data.breakdown AS prop
-  FROM
-    (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), toUInt64(toDateTime(toStartOfDay(timestamp), 'US/Pacific')), [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-            arrayJoin(aggregate_funnel_array_trends_v0(0, 3, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-            toTimeZone(toDateTime(toUInt64(af_tuple.1), 'US/Pacific'), 'US/Pacific') AS entrance_period_start,
-            af_tuple.2 AS success_bool,
-            af_tuple.3 AS breakdown
-     FROM
-       (SELECT toTimeZone(e.timestamp, 'US/Pacific') AS timestamp,
-               if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-               if(equals(e.event, 'step one'), 1, 0) AS step_0,
-               if(equals(e.event, 'step two'), 1, 0) AS step_1,
-               if(equals(e.event, 'step three'), 1, 0) AS step_2
-        FROM events AS e
-        LEFT OUTER JOIN
-          (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                  person_distinct_id_overrides.distinct_id AS distinct_id
-           FROM person_distinct_id_overrides
-           WHERE equals(person_distinct_id_overrides.team_id, 2)
-           GROUP BY person_distinct_id_overrides.distinct_id
-           HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-        WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'US/Pacific'), toDateTime64('2021-04-30 00:00:00.000000', 6, 'US/Pacific')), lessOrEquals(toTimeZone(e.timestamp, 'US/Pacific'), toDateTime64('2021-05-07 23:59:59.999999', 6, 'US/Pacific'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))
-     GROUP BY aggregation_target SETTINGS date_time_output_format='iso',
-                                          date_time_input_format='best_effort') AS data
-  RIGHT OUTER JOIN
-    (SELECT plus(toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull(('2021-04-30 00:00:00'), 6, 'US/Pacific'))), toIntervalDay(period_offsets.number)) AS entrance_period_start
-     FROM numbers(plus(dateDiff('day', toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull(('2021-04-30 00:00:00'), 6, 'US/Pacific'))), toStartOfDay(assumeNotNull(parseDateTime64BestEffortOrNull(('2021-05-07 23:59:59'), 6, 'US/Pacific')))), 1)) AS period_offsets) AS fill ON equals(data.entrance_period_start, fill.entrance_period_start)
-  GROUP BY entrance_period_start,
-           data.breakdown
-  ORDER BY entrance_period_start ASC
-  LIMIT 1000 SETTINGS readonly=2,
-                      max_execution_time=60,
-                      allow_experimental_object_type=1,
-                      format_csv_allow_double_quotes=0,
-                      max_ast_elements=4000000,
-                      max_expanded_ast_elements=4000000,
-                      max_bytes_before_external_group_by=23622320128,
-                      allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelTrendsUDF.test_week_interval
-  '''
-  SELECT fill.entrance_period_start AS entrance_period_start,
-         countIf(ifNull(notEquals(data.success_bool, 0), 1)) AS reached_from_step_count,
-         countIf(ifNull(equals(data.success_bool, 1), 0)) AS reached_to_step_count,
-         if(ifNull(greater(reached_from_step_count, 0), 0), round(multiply(divide(reached_to_step_count, reached_from_step_count), 100), 2), 0) AS conversion_rate,
-         data.breakdown AS prop
-  FROM
-    (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), toUInt64(toDateTime(toStartOfWeek(timestamp, 0), 'UTC')), [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-            arrayJoin(aggregate_funnel_array_trends_v0(0, 3, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-            toTimeZone(toDateTime(toUInt64(af_tuple.1), 'UTC'), 'UTC') AS entrance_period_start,
-            af_tuple.2 AS success_bool,
-            af_tuple.3 AS breakdown
-     FROM
-       (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-               if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-               if(equals(e.event, 'step one'), 1, 0) AS step_0,
-               if(equals(e.event, 'step two'), 1, 0) AS step_1,
-               if(equals(e.event, 'step three'), 1, 0) AS step_2
-        FROM events AS e
-        LEFT OUTER JOIN
-          (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                  person_distinct_id_overrides.distinct_id AS distinct_id
-           FROM person_distinct_id_overrides
-           WHERE equals(person_distinct_id_overrides.team_id, 2)
-           GROUP BY person_distinct_id_overrides.distinct_id
-           HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-        WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-05-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-05-07 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))
-     GROUP BY aggregation_target SETTINGS date_time_output_format='iso',
-                                          date_time_input_format='best_effort') AS data
-  RIGHT OUTER JOIN
-    (SELECT plus(toStartOfWeek(assumeNotNull(parseDateTime64BestEffortOrNull(('2021-05-01 00:00:00'), 6, 'UTC')), 0), toIntervalWeek(period_offsets.number)) AS entrance_period_start
-     FROM numbers(plus(dateDiff('week', toStartOfWeek(assumeNotNull(parseDateTime64BestEffortOrNull(('2021-05-01 00:00:00'), 6, 'UTC')), 0), toStartOfWeek(assumeNotNull(parseDateTime64BestEffortOrNull(('2021-05-07 23:59:59'), 6, 'UTC')), 0)), 1)) AS period_offsets) AS fill ON equals(data.entrance_period_start, fill.entrance_period_start)
-  GROUP BY entrance_period_start,
-           data.breakdown
-  ORDER BY entrance_period_start ASC
-  LIMIT 1000 SETTINGS readonly=2,
-                      max_execution_time=60,
-                      allow_experimental_object_type=1,
-                      format_csv_allow_double_quotes=0,
-                      max_ast_elements=4000000,
-                      max_expanded_ast_elements=4000000,
-                      max_bytes_before_external_group_by=23622320128,
-                      allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelTrendsUDF.test_week_interval.1
-  '''
-
-  SELECT aggregation_target AS actor_id
-  FROM
-    (SELECT aggregation_target,
-            toStartOfWeek(toTimeZone(toDateTime(timestamp, 'UTC'), 'UTC'), 0) AS entrance_period_start,
-            max(steps) AS steps_completed
-     FROM
-       (SELECT *,
-               if(latest_0 <= latest_1
-                  AND latest_1 <= latest_0 + INTERVAL 7 DAY
-                  AND latest_1 <= latest_2
-                  AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
-                                                                   AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps ,
-               if(isNotNull(latest_1)
-                  AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
-               if(isNotNull(latest_2)
-                  AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time
-        FROM
-          (SELECT aggregation_target, timestamp, step_0,
-                                                 latest_0,
-                                                 step_1,
-                                                 latest_1,
-                                                 step_2,
-                                                 min(latest_2) over (PARTITION by aggregation_target
-                                                                     ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    latest_1,
-                                                    step_2,
-                                                    if(latest_2 < latest_1, NULL, latest_2) as latest_2
-              FROM
-                (SELECT aggregation_target, timestamp, step_0,
-                                                       latest_0,
-                                                       step_1,
-                                                       min(latest_1) over (PARTITION by aggregation_target
-                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
-                                                                          step_2,
-                                                                          min(latest_2) over (PARTITION by aggregation_target
-                                                                                              ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'step one', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'step two', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'step three', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND event IN ['step one', 'step three', 'step two']
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2021-05-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2021-05-07 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    WHERE team_id = 2
-                      AND event IN ['step one', 'step three', 'step two']
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2021-05-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2021-05-07 23:59:59', 'UTC')
-                      AND (step_0 = 1
-                           OR step_1 = 1
-                           OR step_2 = 1) ))))
-        WHERE step_0 = 1 )
-     WHERE toDateTime(entrance_period_start) = '2021-04-25 00:00:00'
-     GROUP BY aggregation_target,
-              entrance_period_start)
-  WHERE steps_completed >= 3
-  ORDER BY aggregation_target
-  LIMIT 100
-  OFFSET 0 SETTINGS max_ast_elements=1000000,
-                    max_expanded_ast_elements=1000000
-  '''
-# ---
diff --git a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_udf.ambr b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_udf.ambr
deleted file mode 100644
index b0e26754eca84..0000000000000
--- a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_udf.ambr
+++ /dev/null
@@ -1,1687 +0,0 @@
-# serializer version: 1
-# name: TestFOSSFunnelUDF.test_funnel_conversion_window_seconds
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         sum(step_3) AS step_3,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_1_conversion_times)])[1] AS step_1_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_2_conversion_times)])[1] AS step_2_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_1_conversion_times)])[1] AS step_1_median_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_2_conversion_times)])[1] AS step_2_median_conversion_time,
-         groupArray(row_number) AS row_number,
-         final_prop AS final_prop
-  FROM
-    (SELECT countIf(ifNull(ifNull(equals(step_reached, 0), 0), 0)) AS step_1,
-            countIf(ifNull(ifNull(equals(step_reached, 1), 0), 0)) AS step_2,
-            countIf(ifNull(ifNull(equals(step_reached, 2), 0), 0)) AS step_3,
-            groupArrayIf(timings[1], ifNull(greater(timings[1], 0), 0)) AS step_1_conversion_times,
-            groupArrayIf(timings[2], ifNull(greater(timings[2], 0), 0)) AS step_2_conversion_times,
-            rowNumberInBlock() AS row_number,
-            breakdown AS final_prop
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array(3, 15, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                  if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                  if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                  if(equals(e.event, 'step three'), 1, 0) AS step_2
-           FROM events AS e
-           LEFT OUTER JOIN
-             (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                     person_distinct_id_overrides.distinct_id AS distinct_id
-              FROM person_distinct_id_overrides
-              WHERE equals(person_distinct_id_overrides.team_id, 2)
-              GROUP BY person_distinct_id_overrides.distinct_id
-              HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-           WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-05-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-05-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     GROUP BY breakdown
-     ORDER BY step_3 DESC, step_2 DESC, step_1 DESC)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFOSSFunnelUDF.test_funnel_conversion_window_seconds.1
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         persons.created_at AS created_at,
-         1
-  FROM
-    (SELECT aggregation_target AS actor_id
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array(3, 15, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                  if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                  if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                  if(equals(e.event, 'step three'), 1, 0) AS step_2
-           FROM events AS e
-           LEFT OUTER JOIN
-             (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                     person_distinct_id_overrides.distinct_id AS distinct_id
-              FROM person_distinct_id_overrides
-              WHERE equals(person_distinct_id_overrides.team_id, 2)
-              GROUP BY person_distinct_id_overrides.distinct_id
-              HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-           WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-05-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-05-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     WHERE ifNull(greaterOrEquals(step_reached, 1), 0)
-     ORDER BY aggregation_target ASC) AS source
-  INNER JOIN
-    (SELECT argMax(toTimeZone(person.created_at, 'UTC'), person.version) AS created_at,
-            person.id AS id
-     FROM person
-     WHERE equals(person.team_id, 2)
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.created_at DESC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0,
-                    allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFOSSFunnelUDF.test_funnel_events_with_person_on_events_v2
-  '''
-  
-  SELECT DISTINCT person_id
-  FROM events
-  WHERE team_id = 2
-    AND distinct_id = 'stopped_after_pay'
-  '''
-# ---
-# name: TestFOSSFunnelUDF.test_funnel_events_with_person_on_events_v2.1
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         sum(step_3) AS step_3,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_1_conversion_times)])[1] AS step_1_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_2_conversion_times)])[1] AS step_2_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_1_conversion_times)])[1] AS step_1_median_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_2_conversion_times)])[1] AS step_2_median_conversion_time,
-         groupArray(row_number) AS row_number,
-         final_prop AS final_prop
-  FROM
-    (SELECT countIf(ifNull(ifNull(equals(step_reached, 0), 0), 0)) AS step_1,
-            countIf(ifNull(ifNull(equals(step_reached, 1), 0), 0)) AS step_2,
-            countIf(ifNull(ifNull(equals(step_reached, 2), 0), 0)) AS step_3,
-            groupArrayIf(timings[1], ifNull(greater(timings[1], 0), 0)) AS step_1_conversion_times,
-            groupArrayIf(timings[2], ifNull(greater(timings[2], 0), 0)) AS step_2_conversion_times,
-            rowNumberInBlock() AS row_number,
-            breakdown AS final_prop
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array(3, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                  if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                  if(and(equals(e.event, '$autocapture'), match(e.elements_chain, '(^|;)button(\\.|$|;|:)'), arrayExists(x -> ifNull(equals(x, 'Pay $10'), 0), e.elements_chain_texts)), 1, 0) AS step_1,
-                  if(and(equals(e.event, '$autocapture'), match(e.elements_chain, '(^|;)a(\\.|$|;|:)'), equals(e.elements_chain_href, '/movie')), 1, 0) AS step_2
-           FROM events AS e
-           LEFT OUTER JOIN
-             (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                     person_distinct_id_overrides.distinct_id AS distinct_id
-              FROM person_distinct_id_overrides
-              WHERE equals(person_distinct_id_overrides.team_id, 2)
-              GROUP BY person_distinct_id_overrides.distinct_id
-              HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-           WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2011-12-25 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2012-01-01 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('$autocapture', 'user signed up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     GROUP BY breakdown
-     ORDER BY step_3 DESC, step_2 DESC, step_1 DESC)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFOSSFunnelUDF.test_funnel_with_precalculated_cohort_step_filter
-  '''
-  
-  SELECT count(DISTINCT person_id)
-  FROM cohortpeople
-  WHERE team_id = 2
-    AND cohort_id = 2
-    AND version = NULL
-  '''
-# ---
-# name: TestFOSSFunnelUDF.test_funnel_with_precalculated_cohort_step_filter.1
-  '''
-  /* cohort_calculation: */
-  SELECT count(DISTINCT person_id)
-  FROM cohortpeople
-  WHERE team_id = 2
-    AND cohort_id = 2
-    AND version = 0
-  '''
-# ---
-# name: TestFOSSFunnelUDF.test_funnel_with_precalculated_cohort_step_filter.2
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_1_conversion_times)])[1] AS step_1_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_1_conversion_times)])[1] AS step_1_median_conversion_time,
-         groupArray(row_number) AS row_number,
-         final_prop AS final_prop
-  FROM
-    (SELECT countIf(ifNull(ifNull(equals(step_reached, 0), 0), 0)) AS step_1,
-            countIf(ifNull(ifNull(equals(step_reached, 1), 0), 0)) AS step_2,
-            groupArrayIf(timings[1], ifNull(greater(timings[1], 0), 0)) AS step_1_conversion_times,
-            rowNumberInBlock() AS row_number,
-            breakdown AS final_prop
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                  if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(and(equals(e.event, 'user signed up'), ifNull(in(if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id),
-                                                                        (SELECT cohortpeople.person_id AS person_id
-                                                                         FROM cohortpeople
-                                                                         WHERE and(equals(cohortpeople.team_id, 2), equals(cohortpeople.cohort_id, 2), equals(cohortpeople.version, 0)))), 0)), 1, 0) AS step_0,
-                  if(equals(e.event, 'paid'), 1, 0) AS step_1
-           FROM events AS e
-           LEFT OUTER JOIN
-             (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                     person_distinct_id_overrides.distinct_id AS distinct_id
-              FROM person_distinct_id_overrides
-              WHERE equals(person_distinct_id_overrides.team_id, 2)
-              GROUP BY person_distinct_id_overrides.distinct_id
-              HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-           WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     GROUP BY breakdown
-     ORDER BY step_2 DESC, step_1 DESC)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFOSSFunnelUDF.test_funnel_with_property_groups
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         sum(step_3) AS step_3,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_1_conversion_times)])[1] AS step_1_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_2_conversion_times)])[1] AS step_2_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_1_conversion_times)])[1] AS step_1_median_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_2_conversion_times)])[1] AS step_2_median_conversion_time,
-         groupArray(row_number) AS row_number,
-         final_prop AS final_prop
-  FROM
-    (SELECT countIf(ifNull(ifNull(equals(step_reached, 0), 0), 0)) AS step_1,
-            countIf(ifNull(ifNull(equals(step_reached, 1), 0), 0)) AS step_2,
-            countIf(ifNull(ifNull(equals(step_reached, 2), 0), 0)) AS step_3,
-            groupArrayIf(timings[1], ifNull(greater(timings[1], 0), 0)) AS step_1_conversion_times,
-            groupArrayIf(timings[2], ifNull(greater(timings[2], 0), 0)) AS step_2_conversion_times,
-            rowNumberInBlock() AS row_number,
-            breakdown AS final_prop
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array(3, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                  if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                  if(and(equals(e.event, '$pageview'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$current_url'), ''), 'null'), '^"|"$', ''), 'aloha.com'), 0)), 1, 0) AS step_1,
-                  if(and(equals(e.event, '$pageview'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$current_url'), ''), 'null'), '^"|"$', ''), 'aloha2.com'), 0)), 1, 0) AS step_2
-           FROM events AS e
-           LEFT OUTER JOIN
-             (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                     person_distinct_id_overrides.distinct_id AS distinct_id
-              FROM person_distinct_id_overrides
-              WHERE equals(person_distinct_id_overrides.team_id, 2)
-              GROUP BY person_distinct_id_overrides.distinct_id
-              HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-           LEFT JOIN
-             (SELECT person.id AS id,
-                     replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(person.properties, 'email'), ''), 'null'), '^"|"$', '') AS properties___email,
-                     replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(person.properties, 'age'), ''), 'null'), '^"|"$', '') AS properties___age
-              FROM person
-              WHERE and(equals(person.team_id, 2), ifNull(in(tuple(person.id, person.version),
-                                                               (SELECT person.id AS id, max(person.version) AS version
-                                                                FROM person
-                                                                WHERE equals(person.team_id, 2)
-                                                                GROUP BY person.id
-                                                                HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)))), 0)) SETTINGS optimize_aggregation_in_order=1) AS e__person ON equals(if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id), e__person.id)
-           WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-07-01 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('$pageview', 'user signed up')), or(and(ifNull(ilike(e__person.properties___email, '%.com%'), 0), ifNull(equals(e__person.properties___age, '20'), 0)), or(ifNull(ilike(e__person.properties___email, '%.org%'), 0), ifNull(equals(e__person.properties___age, '28'), 0)))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     GROUP BY breakdown
-     ORDER BY step_3 DESC, step_2 DESC, step_1 DESC)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFOSSFunnelUDF.test_funnel_with_property_groups.1
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         persons.created_at AS created_at,
-         1
-  FROM
-    (SELECT aggregation_target AS actor_id
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array(3, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                  if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                  if(and(equals(e.event, '$pageview'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$current_url'), ''), 'null'), '^"|"$', ''), 'aloha.com'), 0)), 1, 0) AS step_1,
-                  if(and(equals(e.event, '$pageview'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$current_url'), ''), 'null'), '^"|"$', ''), 'aloha2.com'), 0)), 1, 0) AS step_2
-           FROM events AS e
-           LEFT OUTER JOIN
-             (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                     person_distinct_id_overrides.distinct_id AS distinct_id
-              FROM person_distinct_id_overrides
-              WHERE equals(person_distinct_id_overrides.team_id, 2)
-              GROUP BY person_distinct_id_overrides.distinct_id
-              HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-           LEFT JOIN
-             (SELECT person.id AS id,
-                     replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(person.properties, 'email'), ''), 'null'), '^"|"$', '') AS properties___email,
-                     replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(person.properties, 'age'), ''), 'null'), '^"|"$', '') AS properties___age
-              FROM person
-              WHERE and(equals(person.team_id, 2), ifNull(in(tuple(person.id, person.version),
-                                                               (SELECT person.id AS id, max(person.version) AS version
-                                                                FROM person
-                                                                WHERE equals(person.team_id, 2)
-                                                                GROUP BY person.id
-                                                                HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)))), 0)) SETTINGS optimize_aggregation_in_order=1) AS e__person ON equals(if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id), e__person.id)
-           WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-07-01 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('$pageview', 'user signed up')), or(and(ifNull(ilike(e__person.properties___email, '%.com%'), 0), ifNull(equals(e__person.properties___age, '20'), 0)), or(ifNull(ilike(e__person.properties___email, '%.org%'), 0), ifNull(equals(e__person.properties___age, '28'), 0)))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     WHERE ifNull(greaterOrEquals(step_reached, 0), 0)
-     ORDER BY aggregation_target ASC) AS source
-  INNER JOIN
-    (SELECT argMax(toTimeZone(person.created_at, 'UTC'), person.version) AS created_at,
-            person.id AS id
-     FROM person
-     WHERE equals(person.team_id, 2)
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.created_at DESC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0,
-                    allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFOSSFunnelUDF.test_funnel_with_property_groups.2
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         persons.created_at AS created_at,
-         1
-  FROM
-    (SELECT aggregation_target AS actor_id
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array(3, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                  if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                  if(and(equals(e.event, '$pageview'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$current_url'), ''), 'null'), '^"|"$', ''), 'aloha.com'), 0)), 1, 0) AS step_1,
-                  if(and(equals(e.event, '$pageview'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$current_url'), ''), 'null'), '^"|"$', ''), 'aloha2.com'), 0)), 1, 0) AS step_2
-           FROM events AS e
-           LEFT OUTER JOIN
-             (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                     person_distinct_id_overrides.distinct_id AS distinct_id
-              FROM person_distinct_id_overrides
-              WHERE equals(person_distinct_id_overrides.team_id, 2)
-              GROUP BY person_distinct_id_overrides.distinct_id
-              HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-           LEFT JOIN
-             (SELECT person.id AS id,
-                     replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(person.properties, 'email'), ''), 'null'), '^"|"$', '') AS properties___email,
-                     replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(person.properties, 'age'), ''), 'null'), '^"|"$', '') AS properties___age
-              FROM person
-              WHERE and(equals(person.team_id, 2), ifNull(in(tuple(person.id, person.version),
-                                                               (SELECT person.id AS id, max(person.version) AS version
-                                                                FROM person
-                                                                WHERE equals(person.team_id, 2)
-                                                                GROUP BY person.id
-                                                                HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)))), 0)) SETTINGS optimize_aggregation_in_order=1) AS e__person ON equals(if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id), e__person.id)
-           WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-07-01 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('$pageview', 'user signed up')), or(and(ifNull(ilike(e__person.properties___email, '%.com%'), 0), ifNull(equals(e__person.properties___age, '20'), 0)), or(ifNull(ilike(e__person.properties___email, '%.org%'), 0), ifNull(equals(e__person.properties___age, '28'), 0)))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     WHERE ifNull(greaterOrEquals(step_reached, 1), 0)
-     ORDER BY aggregation_target ASC) AS source
-  INNER JOIN
-    (SELECT argMax(toTimeZone(person.created_at, 'UTC'), person.version) AS created_at,
-            person.id AS id
-     FROM person
-     WHERE equals(person.team_id, 2)
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.created_at DESC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0,
-                    allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFOSSFunnelUDF.test_funnel_with_property_groups.3
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         persons.created_at AS created_at,
-         1
-  FROM
-    (SELECT aggregation_target AS actor_id
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array(3, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                  if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                  if(and(equals(e.event, '$pageview'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$current_url'), ''), 'null'), '^"|"$', ''), 'aloha.com'), 0)), 1, 0) AS step_1,
-                  if(and(equals(e.event, '$pageview'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$current_url'), ''), 'null'), '^"|"$', ''), 'aloha2.com'), 0)), 1, 0) AS step_2
-           FROM events AS e
-           LEFT OUTER JOIN
-             (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                     person_distinct_id_overrides.distinct_id AS distinct_id
-              FROM person_distinct_id_overrides
-              WHERE equals(person_distinct_id_overrides.team_id, 2)
-              GROUP BY person_distinct_id_overrides.distinct_id
-              HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-           LEFT JOIN
-             (SELECT person.id AS id,
-                     replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(person.properties, 'email'), ''), 'null'), '^"|"$', '') AS properties___email,
-                     replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(person.properties, 'age'), ''), 'null'), '^"|"$', '') AS properties___age
-              FROM person
-              WHERE and(equals(person.team_id, 2), ifNull(in(tuple(person.id, person.version),
-                                                               (SELECT person.id AS id, max(person.version) AS version
-                                                                FROM person
-                                                                WHERE equals(person.team_id, 2)
-                                                                GROUP BY person.id
-                                                                HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)))), 0)) SETTINGS optimize_aggregation_in_order=1) AS e__person ON equals(if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id), e__person.id)
-           WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-07-01 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('$pageview', 'user signed up')), or(and(ifNull(ilike(e__person.properties___email, '%.com%'), 0), ifNull(equals(e__person.properties___age, '20'), 0)), or(ifNull(ilike(e__person.properties___email, '%.org%'), 0), ifNull(equals(e__person.properties___age, '28'), 0)))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     WHERE ifNull(greaterOrEquals(step_reached, 2), 0)
-     ORDER BY aggregation_target ASC) AS source
-  INNER JOIN
-    (SELECT argMax(toTimeZone(person.created_at, 'UTC'), person.version) AS created_at,
-            person.id AS id
-     FROM person
-     WHERE equals(person.team_id, 2)
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.created_at DESC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0,
-                    allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFOSSFunnelUDF.test_funnel_with_static_cohort_step_filter
-  '''
-  
-  SELECT count(DISTINCT person_id)
-  FROM person_static_cohort
-  WHERE team_id = 2
-    AND cohort_id = 2
-  '''
-# ---
-# name: TestFOSSFunnelUDF.test_funnel_with_static_cohort_step_filter.1
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_1_conversion_times)])[1] AS step_1_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_1_conversion_times)])[1] AS step_1_median_conversion_time,
-         groupArray(row_number) AS row_number,
-         final_prop AS final_prop
-  FROM
-    (SELECT countIf(ifNull(ifNull(equals(step_reached, 0), 0), 0)) AS step_1,
-            countIf(ifNull(ifNull(equals(step_reached, 1), 0), 0)) AS step_2,
-            groupArrayIf(timings[1], ifNull(greater(timings[1], 0), 0)) AS step_1_conversion_times,
-            rowNumberInBlock() AS row_number,
-            breakdown AS final_prop
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                  if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(and(equals(e.event, 'user signed up'), ifNull(in(if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id),
-                                                                        (SELECT person_static_cohort.person_id AS person_id
-                                                                         FROM person_static_cohort
-                                                                         WHERE and(equals(person_static_cohort.team_id, 2), equals(person_static_cohort.cohort_id, 2)))), 0)), 1, 0) AS step_0,
-                  if(equals(e.event, 'paid'), 1, 0) AS step_1
-           FROM events AS e
-           LEFT OUTER JOIN
-             (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                     person_distinct_id_overrides.distinct_id AS distinct_id
-              FROM person_distinct_id_overrides
-              WHERE equals(person_distinct_id_overrides.team_id, 2)
-              GROUP BY person_distinct_id_overrides.distinct_id
-              HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-           WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('paid', 'user signed up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     GROUP BY breakdown
-     ORDER BY step_2 DESC, step_1 DESC)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFOSSFunnelUDF.test_timezones
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_1_conversion_times)])[1] AS step_1_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_1_conversion_times)])[1] AS step_1_median_conversion_time,
-         groupArray(row_number) AS row_number,
-         final_prop AS final_prop
-  FROM
-    (SELECT countIf(ifNull(ifNull(equals(step_reached, 0), 0), 0)) AS step_1,
-            countIf(ifNull(ifNull(equals(step_reached, 1), 0), 0)) AS step_2,
-            groupArrayIf(timings[1], ifNull(greater(timings[1], 0), 0)) AS step_1_conversion_times,
-            rowNumberInBlock() AS row_number,
-            breakdown AS final_prop
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, [], arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', [[]], events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT toTimeZone(e.timestamp, 'US/Pacific') AS timestamp,
-                  if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                  e.uuid AS uuid,
-                  e.`$session_id` AS `$session_id`,
-                  e.`$window_id` AS `$window_id`,
-                  if(equals(e.event, 'user signed up'), 1, 0) AS step_0,
-                  if(equals(e.event, 'paid'), 1, 0) AS step_1
-           FROM events AS e
-           LEFT OUTER JOIN
-             (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                     person_distinct_id_overrides.distinct_id AS distinct_id
-              FROM person_distinct_id_overrides
-              WHERE equals(person_distinct_id_overrides.team_id, 2)
-              GROUP BY person_distinct_id_overrides.distinct_id
-              HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-           WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'US/Pacific'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'US/Pacific')), lessOrEquals(toTimeZone(e.timestamp, 'US/Pacific'), toDateTime64('2020-01-14 23:59:59.999999', 6, 'US/Pacific'))), in(e.event, tuple('paid', 'user signed up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     GROUP BY breakdown
-     ORDER BY step_2 DESC, step_1 DESC)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelBreakdownUDF.test_funnel_breakdown_correct_breakdown_props_are_chosen
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_1_conversion_times)])[1] AS step_1_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_1_conversion_times)])[1] AS step_1_median_conversion_time,
-         groupArray(row_number) AS row_number,
-         final_prop AS final_prop
-  FROM
-    (SELECT countIf(ifNull(ifNull(equals(step_reached, 0), 0), 0)) AS step_1,
-            countIf(ifNull(ifNull(equals(step_reached, 1), 0), 0)) AS step_2,
-            groupArrayIf(timings[1], ifNull(greater(timings[1], 0), 0)) AS step_1_conversion_times,
-            rowNumberInBlock() AS row_number,
-            if(ifNull(less(row_number, 25), 0), breakdown, ['Other']) AS final_prop
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, prop, arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', groupUniqArray(prop), events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT timestamp AS timestamp,
-                  aggregation_target AS aggregation_target,
-                  uuid AS uuid,
-                          `$session_id` AS `$session_id`,
-                          `$window_id` AS `$window_id`,
-                          step_0 AS step_0,
-                          step_1 AS step_1,
-                          prop_basic AS prop_basic,
-                          prop,
-                          prop_vals AS prop_vals,
-                          if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, ['']) AS prop
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                     if(and(equals(e.event, 'buy'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), 'xyz'), 0)), 1, 0) AS step_1,
-                     [ifNull(toString(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', '')), '')] AS prop_basic,
-                     prop_basic AS prop,
-                     argMinIf(prop, timestamp, notEmpty(arrayFilter(x -> notEmpty(x), prop))) OVER (PARTITION BY aggregation_target) AS prop_vals
-              FROM events AS e
-              LEFT OUTER JOIN
-                (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                        person_distinct_id_overrides.distinct_id AS distinct_id
-                 FROM person_distinct_id_overrides
-                 WHERE equals(person_distinct_id_overrides.team_id, 2)
-                 GROUP BY person_distinct_id_overrides.distinct_id
-                 HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-              WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0)))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     GROUP BY breakdown
-     ORDER BY step_2 DESC, step_1 DESC)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelBreakdownUDF.test_funnel_breakdown_correct_breakdown_props_are_chosen_for_step
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_1_conversion_times)])[1] AS step_1_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_1_conversion_times)])[1] AS step_1_median_conversion_time,
-         groupArray(row_number) AS row_number,
-         final_prop AS final_prop
-  FROM
-    (SELECT countIf(ifNull(ifNull(equals(step_reached, 0), 0), 0)) AS step_1,
-            countIf(ifNull(ifNull(equals(step_reached, 1), 0), 0)) AS step_2,
-            groupArrayIf(timings[1], ifNull(greater(timings[1], 0), 0)) AS step_1_conversion_times,
-            rowNumberInBlock() AS row_number,
-            if(ifNull(less(row_number, 25), 0), breakdown, ['Other']) AS final_prop
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, prop, arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array(2, 1209600, 'step_1', 'ordered', groupUniqArray(prop), events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT timestamp AS timestamp,
-                  aggregation_target AS aggregation_target,
-                  uuid AS uuid,
-                          `$session_id` AS `$session_id`,
-                          `$window_id` AS `$window_id`,
-                          step_0 AS step_0,
-                          step_1 AS step_1,
-                          prop_basic AS prop_basic,
-                          prop_0 AS prop_0,
-                          prop_1 AS prop_1,
-                          prop,
-                          prop_vals AS prop_vals,
-                          prop
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                     if(and(equals(e.event, 'buy'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), 'xyz'), 0)), 1, 0) AS step_1,
-                     [ifNull(toString(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', '')), '')] AS prop_basic,
-                     if(ifNull(equals(step_0, 1), 0), prop_basic, []) AS prop_0,
-                     if(ifNull(equals(step_1, 1), 0), prop_basic, []) AS prop_1,
-                     prop_1 AS prop,
-                     groupUniqArray(prop) OVER (PARTITION BY aggregation_target) AS prop_vals
-              FROM events AS e
-              LEFT OUTER JOIN
-                (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                        person_distinct_id_overrides.distinct_id AS distinct_id
-                 FROM person_distinct_id_overrides
-                 WHERE equals(person_distinct_id_overrides.team_id, 2)
-                 GROUP BY person_distinct_id_overrides.distinct_id
-                 HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-              WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0)))) ARRAY
-           JOIN prop_vals AS prop
-           WHERE ifNull(notEquals(prop, []), isNotNull(prop)
-                        or isNotNull([])))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     GROUP BY breakdown
-     ORDER BY step_2 DESC, step_1 DESC)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelBreakdownUDF.test_funnel_step_multiple_breakdown_snapshot
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_1_conversion_times)])[1] AS step_1_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_1_conversion_times)])[1] AS step_1_median_conversion_time,
-         groupArray(row_number) AS row_number,
-         final_prop AS final_prop
-  FROM
-    (SELECT countIf(ifNull(ifNull(equals(step_reached, 0), 0), 0)) AS step_1,
-            countIf(ifNull(ifNull(equals(step_reached, 1), 0), 0)) AS step_2,
-            groupArrayIf(timings[1], ifNull(greater(timings[1], 0), 0)) AS step_1_conversion_times,
-            rowNumberInBlock() AS row_number,
-            if(ifNull(less(row_number, 25), 0), breakdown, ['Other']) AS final_prop
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, prop, arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1)])))) AS events_array,
-               arrayJoin(aggregate_funnel_array(2, 1209600, 'first_touch', 'ordered', groupUniqArray(prop), events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT timestamp AS timestamp,
-                  aggregation_target AS aggregation_target,
-                  uuid AS uuid,
-                          `$session_id` AS `$session_id`,
-                          `$window_id` AS `$window_id`,
-                          step_0 AS step_0,
-                          step_1 AS step_1,
-                          prop_basic AS prop_basic,
-                          prop,
-                          prop_vals AS prop_vals,
-                          if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, ['', '']) AS prop
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                     if(equals(e.event, 'buy'), 1, 0) AS step_1,
-                     [ifNull(toString(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', '')), ''), ifNull(toString(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', '')), '')] AS prop_basic,
-                     prop_basic AS prop,
-                     argMinIf(prop, timestamp, notEmpty(arrayFilter(x -> notEmpty(x), prop))) OVER (PARTITION BY aggregation_target) AS prop_vals
-              FROM events AS e
-              LEFT OUTER JOIN
-                (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                        person_distinct_id_overrides.distinct_id AS distinct_id
-                 FROM person_distinct_id_overrides
-                 WHERE equals(person_distinct_id_overrides.team_id, 2)
-                 GROUP BY person_distinct_id_overrides.distinct_id
-                 HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-              WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0)))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     GROUP BY breakdown
-     ORDER BY step_2 DESC, step_1 DESC)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelGroupBreakdownUDF.test_funnel_aggregate_by_groups_breakdown_group_person_on_events
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         sum(step_3) AS step_3,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_1_conversion_times)])[1] AS step_1_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_2_conversion_times)])[1] AS step_2_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_1_conversion_times)])[1] AS step_1_median_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_2_conversion_times)])[1] AS step_2_median_conversion_time,
-         groupArray(row_number) AS row_number,
-         final_prop AS final_prop
-  FROM
-    (SELECT countIf(ifNull(ifNull(equals(step_reached, 0), 0), 0)) AS step_1,
-            countIf(ifNull(ifNull(equals(step_reached, 1), 0), 0)) AS step_2,
-            countIf(ifNull(ifNull(equals(step_reached, 2), 0), 0)) AS step_3,
-            groupArrayIf(timings[1], ifNull(greater(timings[1], 0), 0)) AS step_1_conversion_times,
-            groupArrayIf(timings[2], ifNull(greater(timings[2], 0), 0)) AS step_2_conversion_times,
-            rowNumberInBlock() AS row_number,
-            if(ifNull(less(row_number, 25), 0), breakdown, 'Other') AS final_prop
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, prop, arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-               arrayJoin(aggregate_funnel(3, 1209600, 'first_touch', 'ordered', groupUniqArray(prop), events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT timestamp AS timestamp,
-                  aggregation_target AS aggregation_target,
-                  uuid AS uuid,
-                          `$session_id` AS `$session_id`,
-                          `$window_id` AS `$window_id`,
-                          step_0 AS step_0,
-                          step_1 AS step_1,
-                          step_2 AS step_2,
-                          prop_basic AS prop_basic,
-                          prop,
-                          prop_vals AS prop_vals,
-                          prop_vals AS prop
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     e.`$group_0` AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                     if(equals(e.event, 'play movie'), 1, 0) AS step_1,
-                     if(equals(e.event, 'buy'), 1, 0) AS step_2,
-                     ifNull(toString(e__group_0.properties___industry), '') AS prop_basic,
-                     prop_basic AS prop,
-                     argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
-              FROM events AS e
-              LEFT JOIN
-                (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                        groups.group_type_index AS index,
-                        groups.group_key AS key
-                 FROM groups
-                 WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                 GROUP BY groups.group_type_index,
-                          groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-              WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     GROUP BY breakdown
-     ORDER BY step_3 DESC, step_2 DESC, step_1 DESC)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelGroupBreakdownUDF.test_funnel_aggregate_by_groups_breakdown_group_person_on_events_poe_v2
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         sum(step_3) AS step_3,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_1_conversion_times)])[1] AS step_1_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_2_conversion_times)])[1] AS step_2_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_1_conversion_times)])[1] AS step_1_median_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_2_conversion_times)])[1] AS step_2_median_conversion_time,
-         groupArray(row_number) AS row_number,
-         final_prop AS final_prop
-  FROM
-    (SELECT countIf(ifNull(ifNull(equals(step_reached, 0), 0), 0)) AS step_1,
-            countIf(ifNull(ifNull(equals(step_reached, 1), 0), 0)) AS step_2,
-            countIf(ifNull(ifNull(equals(step_reached, 2), 0), 0)) AS step_3,
-            groupArrayIf(timings[1], ifNull(greater(timings[1], 0), 0)) AS step_1_conversion_times,
-            groupArrayIf(timings[2], ifNull(greater(timings[2], 0), 0)) AS step_2_conversion_times,
-            rowNumberInBlock() AS row_number,
-            if(ifNull(less(row_number, 25), 0), breakdown, 'Other') AS final_prop
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, prop, arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-               arrayJoin(aggregate_funnel(3, 1209600, 'first_touch', 'ordered', groupUniqArray(prop), events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT timestamp AS timestamp,
-                  aggregation_target AS aggregation_target,
-                  uuid AS uuid,
-                          `$session_id` AS `$session_id`,
-                          `$window_id` AS `$window_id`,
-                          step_0 AS step_0,
-                          step_1 AS step_1,
-                          step_2 AS step_2,
-                          prop_basic AS prop_basic,
-                          prop,
-                          prop_vals AS prop_vals,
-                          prop_vals AS prop
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     e.`$group_0` AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                     if(equals(e.event, 'play movie'), 1, 0) AS step_1,
-                     if(equals(e.event, 'buy'), 1, 0) AS step_2,
-                     ifNull(toString(e__group_0.properties___industry), '') AS prop_basic,
-                     prop_basic AS prop,
-                     argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
-              FROM events AS e
-              LEFT JOIN
-                (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                        groups.group_type_index AS index,
-                        groups.group_key AS key
-                 FROM groups
-                 WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                 GROUP BY groups.group_type_index,
-                          groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-              WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     GROUP BY breakdown
-     ORDER BY step_3 DESC, step_2 DESC, step_1 DESC)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelGroupBreakdownUDF.test_funnel_breakdown_group
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         sum(step_3) AS step_3,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_1_conversion_times)])[1] AS step_1_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [avgArrayOrNull(step_2_conversion_times)])[1] AS step_2_average_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_1_conversion_times)])[1] AS step_1_median_conversion_time,
-         arrayMap(x -> if(isNaN(x), NULL, x), [medianArrayOrNull(step_2_conversion_times)])[1] AS step_2_median_conversion_time,
-         groupArray(row_number) AS row_number,
-         final_prop AS final_prop
-  FROM
-    (SELECT countIf(ifNull(ifNull(equals(step_reached, 0), 0), 0)) AS step_1,
-            countIf(ifNull(ifNull(equals(step_reached, 1), 0), 0)) AS step_2,
-            countIf(ifNull(ifNull(equals(step_reached, 2), 0), 0)) AS step_3,
-            groupArrayIf(timings[1], ifNull(greater(timings[1], 0), 0)) AS step_1_conversion_times,
-            groupArrayIf(timings[2], ifNull(greater(timings[2], 0), 0)) AS step_2_conversion_times,
-            rowNumberInBlock() AS row_number,
-            if(ifNull(less(row_number, 25), 0), breakdown, 'Other') AS final_prop
-     FROM
-       (SELECT arraySort(t -> t.1, groupArray(tuple(accurateCastOrNull(timestamp, 'Float64'), uuid, prop, arrayFilter(x -> ifNull(notEquals(x, 0), 1), [multiply(1, step_0), multiply(2, step_1), multiply(3, step_2)])))) AS events_array,
-               arrayJoin(aggregate_funnel(3, 1209600, 'first_touch', 'ordered', groupUniqArray(prop), events_array)) AS af_tuple,
-               af_tuple.1 AS step_reached,
-               plus(af_tuple.1, 1) AS steps,
-               af_tuple.2 AS breakdown,
-               af_tuple.3 AS timings,
-               aggregation_target AS aggregation_target
-        FROM
-          (SELECT timestamp AS timestamp,
-                  aggregation_target AS aggregation_target,
-                  uuid AS uuid,
-                          `$session_id` AS `$session_id`,
-                          `$window_id` AS `$window_id`,
-                          step_0 AS step_0,
-                          step_1 AS step_1,
-                          step_2 AS step_2,
-                          prop_basic AS prop_basic,
-                          prop,
-                          prop_vals AS prop_vals,
-                          prop_vals AS prop
-           FROM
-             (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                     if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                     e.uuid AS uuid,
-                     e.`$session_id` AS `$session_id`,
-                     e.`$window_id` AS `$window_id`,
-                     if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                     if(equals(e.event, 'play movie'), 1, 0) AS step_1,
-                     if(equals(e.event, 'buy'), 1, 0) AS step_2,
-                     ifNull(toString(e__group_0.properties___industry), '') AS prop_basic,
-                     prop_basic AS prop,
-                     argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
-              FROM events AS e
-              LEFT OUTER JOIN
-                (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                        person_distinct_id_overrides.distinct_id AS distinct_id
-                 FROM person_distinct_id_overrides
-                 WHERE equals(person_distinct_id_overrides.team_id, 2)
-                 GROUP BY person_distinct_id_overrides.distinct_id
-                 HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-              LEFT JOIN
-                (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                        groups.group_type_index AS index,
-                        groups.group_key AS key
-                 FROM groups
-                 WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                 GROUP BY groups.group_type_index,
-                          groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-              WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-        GROUP BY aggregation_target
-        HAVING ifNull(greaterOrEquals(step_reached, 0), 0))
-     GROUP BY breakdown
-     ORDER BY step_3 DESC, step_2 DESC, step_1 DESC)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelGroupBreakdownUDF.test_funnel_breakdown_group.1
-  '''
-  
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestFunnelGroupBreakdownUDF.test_funnel_breakdown_group.2
-  '''
-  
-  SELECT aggregation_target AS actor_id
-  FROM
-    (SELECT aggregation_target,
-            steps,
-            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
-            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
-            median(step_1_conversion_time) step_1_median_conversion_time_inner,
-            median(step_2_conversion_time) step_2_median_conversion_time_inner ,
-            prop
-     FROM
-       (SELECT aggregation_target,
-               steps,
-               max(steps) over (PARTITION BY aggregation_target,
-                                             prop) as max_steps,
-                               step_1_conversion_time,
-                               step_2_conversion_time ,
-                               prop
-        FROM
-          (SELECT *,
-                  if(latest_0 <= latest_1
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY
-                     AND latest_1 <= latest_2
-                     AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
-                                                                      AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps ,
-                  if(isNotNull(latest_1)
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
-                  if(isNotNull(latest_2)
-                     AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time,
-                  prop
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    latest_1,
-                                                    step_2,
-                                                    min(latest_2) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
-                                                                       prop
-              FROM
-                (SELECT aggregation_target, timestamp, step_0,
-                                                       latest_0,
-                                                       step_1,
-                                                       latest_1,
-                                                       step_2,
-                                                       if(latest_2 < latest_1, NULL, latest_2) as latest_2 ,
-                                                       prop
-                 FROM
-                   (SELECT aggregation_target, timestamp, step_0,
-                                                          latest_0,
-                                                          step_1,
-                                                          min(latest_1) over (PARTITION by aggregation_target,
-                                                                                           prop
-                                                                              ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
-                                                                             step_2,
-                                                                             min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                              prop
-                                                                                                 ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
-                                                                                                if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-                    FROM
-                      (SELECT *,
-                              prop_vals as prop
-                       FROM
-                         (SELECT e.timestamp as timestamp,
-                                 if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                                 if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                                 if(event = 'sign up', 1, 0) as step_0,
-                                 if(step_0 = 1, timestamp, null) as latest_0,
-                                 if(event = 'play movie', 1, 0) as step_1,
-                                 if(step_1 = 1, timestamp, null) as latest_1,
-                                 if(event = 'buy', 1, 0) as step_2,
-                                 if(step_2 = 1, timestamp, null) as latest_2,
-                                 replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                                 prop_basic as prop,
-                                 argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                          FROM events e
-                          LEFT OUTER JOIN
-                            (SELECT distinct_id,
-                                    argMax(person_id, version) as person_id
-                             FROM person_distinct_id2
-                             WHERE team_id = 2
-                               AND distinct_id IN
-                                 (SELECT distinct_id
-                                  FROM events
-                                  WHERE team_id = 2
-                                    AND event IN ['buy', 'play movie', 'sign up']
-                                    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                                    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                             GROUP BY distinct_id
-                             HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                          LEFT JOIN
-                            (SELECT group_key,
-                                    argMax(group_properties, _timestamp) AS group_properties_0
-                             FROM groups
-                             WHERE team_id = 2
-                               AND group_type_index = 0
-                             GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                          WHERE team_id = 2
-                            AND event IN ['buy', 'play movie', 'sign up']
-                            AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                            AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                            AND (step_0 = 1
-                                 OR step_1 = 1
-                                 OR step_2 = 1) )))))
-           WHERE step_0 = 1 ))
-     GROUP BY aggregation_target,
-              steps,
-              max_steps,
-              prop
-     HAVING steps = max_steps)
-  WHERE steps IN [1, 2, 3]
-    AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
-  ORDER BY aggregation_target
-  LIMIT 100
-  OFFSET 0 SETTINGS max_ast_elements=1000000,
-                    max_expanded_ast_elements=1000000
-  '''
-# ---
-# name: TestFunnelGroupBreakdownUDF.test_funnel_breakdown_group.3
-  '''
-  
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestFunnelGroupBreakdownUDF.test_funnel_breakdown_group.4
-  '''
-  
-  SELECT aggregation_target AS actor_id
-  FROM
-    (SELECT aggregation_target,
-            steps,
-            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
-            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
-            median(step_1_conversion_time) step_1_median_conversion_time_inner,
-            median(step_2_conversion_time) step_2_median_conversion_time_inner ,
-            prop
-     FROM
-       (SELECT aggregation_target,
-               steps,
-               max(steps) over (PARTITION BY aggregation_target,
-                                             prop) as max_steps,
-                               step_1_conversion_time,
-                               step_2_conversion_time ,
-                               prop
-        FROM
-          (SELECT *,
-                  if(latest_0 <= latest_1
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY
-                     AND latest_1 <= latest_2
-                     AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
-                                                                      AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps ,
-                  if(isNotNull(latest_1)
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
-                  if(isNotNull(latest_2)
-                     AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time,
-                  prop
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    latest_1,
-                                                    step_2,
-                                                    min(latest_2) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
-                                                                       prop
-              FROM
-                (SELECT aggregation_target, timestamp, step_0,
-                                                       latest_0,
-                                                       step_1,
-                                                       latest_1,
-                                                       step_2,
-                                                       if(latest_2 < latest_1, NULL, latest_2) as latest_2 ,
-                                                       prop
-                 FROM
-                   (SELECT aggregation_target, timestamp, step_0,
-                                                          latest_0,
-                                                          step_1,
-                                                          min(latest_1) over (PARTITION by aggregation_target,
-                                                                                           prop
-                                                                              ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
-                                                                             step_2,
-                                                                             min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                              prop
-                                                                                                 ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
-                                                                                                if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-                    FROM
-                      (SELECT *,
-                              prop_vals as prop
-                       FROM
-                         (SELECT e.timestamp as timestamp,
-                                 if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                                 if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                                 if(event = 'sign up', 1, 0) as step_0,
-                                 if(step_0 = 1, timestamp, null) as latest_0,
-                                 if(event = 'play movie', 1, 0) as step_1,
-                                 if(step_1 = 1, timestamp, null) as latest_1,
-                                 if(event = 'buy', 1, 0) as step_2,
-                                 if(step_2 = 1, timestamp, null) as latest_2,
-                                 replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                                 prop_basic as prop,
-                                 argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                          FROM events e
-                          LEFT OUTER JOIN
-                            (SELECT distinct_id,
-                                    argMax(person_id, version) as person_id
-                             FROM person_distinct_id2
-                             WHERE team_id = 2
-                               AND distinct_id IN
-                                 (SELECT distinct_id
-                                  FROM events
-                                  WHERE team_id = 2
-                                    AND event IN ['buy', 'play movie', 'sign up']
-                                    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                                    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                             GROUP BY distinct_id
-                             HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                          LEFT JOIN
-                            (SELECT group_key,
-                                    argMax(group_properties, _timestamp) AS group_properties_0
-                             FROM groups
-                             WHERE team_id = 2
-                               AND group_type_index = 0
-                             GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                          WHERE team_id = 2
-                            AND event IN ['buy', 'play movie', 'sign up']
-                            AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                            AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                            AND (step_0 = 1
-                                 OR step_1 = 1
-                                 OR step_2 = 1) )))))
-           WHERE step_0 = 1 ))
-     GROUP BY aggregation_target,
-              steps,
-              max_steps,
-              prop
-     HAVING steps = max_steps)
-  WHERE steps IN [2, 3]
-    AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
-  ORDER BY aggregation_target
-  LIMIT 100
-  OFFSET 0 SETTINGS max_ast_elements=1000000,
-                    max_expanded_ast_elements=1000000
-  '''
-# ---
-# name: TestFunnelGroupBreakdownUDF.test_funnel_breakdown_group.5
-  '''
-  
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestFunnelGroupBreakdownUDF.test_funnel_breakdown_group.6
-  '''
-  
-  SELECT aggregation_target AS actor_id
-  FROM
-    (SELECT aggregation_target,
-            steps,
-            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
-            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
-            median(step_1_conversion_time) step_1_median_conversion_time_inner,
-            median(step_2_conversion_time) step_2_median_conversion_time_inner ,
-            prop
-     FROM
-       (SELECT aggregation_target,
-               steps,
-               max(steps) over (PARTITION BY aggregation_target,
-                                             prop) as max_steps,
-                               step_1_conversion_time,
-                               step_2_conversion_time ,
-                               prop
-        FROM
-          (SELECT *,
-                  if(latest_0 <= latest_1
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY
-                     AND latest_1 <= latest_2
-                     AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
-                                                                      AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps ,
-                  if(isNotNull(latest_1)
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
-                  if(isNotNull(latest_2)
-                     AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time,
-                  prop
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    latest_1,
-                                                    step_2,
-                                                    min(latest_2) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
-                                                                       prop
-              FROM
-                (SELECT aggregation_target, timestamp, step_0,
-                                                       latest_0,
-                                                       step_1,
-                                                       latest_1,
-                                                       step_2,
-                                                       if(latest_2 < latest_1, NULL, latest_2) as latest_2 ,
-                                                       prop
-                 FROM
-                   (SELECT aggregation_target, timestamp, step_0,
-                                                          latest_0,
-                                                          step_1,
-                                                          min(latest_1) over (PARTITION by aggregation_target,
-                                                                                           prop
-                                                                              ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
-                                                                             step_2,
-                                                                             min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                              prop
-                                                                                                 ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
-                                                                                                if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-                    FROM
-                      (SELECT *,
-                              prop_vals as prop
-                       FROM
-                         (SELECT e.timestamp as timestamp,
-                                 if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                                 if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                                 if(event = 'sign up', 1, 0) as step_0,
-                                 if(step_0 = 1, timestamp, null) as latest_0,
-                                 if(event = 'play movie', 1, 0) as step_1,
-                                 if(step_1 = 1, timestamp, null) as latest_1,
-                                 if(event = 'buy', 1, 0) as step_2,
-                                 if(step_2 = 1, timestamp, null) as latest_2,
-                                 replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                                 prop_basic as prop,
-                                 argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                          FROM events e
-                          LEFT OUTER JOIN
-                            (SELECT distinct_id,
-                                    argMax(person_id, version) as person_id
-                             FROM person_distinct_id2
-                             WHERE team_id = 2
-                               AND distinct_id IN
-                                 (SELECT distinct_id
-                                  FROM events
-                                  WHERE team_id = 2
-                                    AND event IN ['buy', 'play movie', 'sign up']
-                                    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                                    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                             GROUP BY distinct_id
-                             HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                          LEFT JOIN
-                            (SELECT group_key,
-                                    argMax(group_properties, _timestamp) AS group_properties_0
-                             FROM groups
-                             WHERE team_id = 2
-                               AND group_type_index = 0
-                             GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                          WHERE team_id = 2
-                            AND event IN ['buy', 'play movie', 'sign up']
-                            AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                            AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                            AND (step_0 = 1
-                                 OR step_1 = 1
-                                 OR step_2 = 1) )))))
-           WHERE step_0 = 1 ))
-     GROUP BY aggregation_target,
-              steps,
-              max_steps,
-              prop
-     HAVING steps = max_steps)
-  WHERE steps IN [1, 2, 3]
-    AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
-  ORDER BY aggregation_target
-  LIMIT 100
-  OFFSET 0 SETTINGS max_ast_elements=1000000,
-                    max_expanded_ast_elements=1000000
-  '''
-# ---
-# name: TestFunnelGroupBreakdownUDF.test_funnel_breakdown_group.7
-  '''
-  
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestFunnelGroupBreakdownUDF.test_funnel_breakdown_group.8
-  '''
-  
-  SELECT aggregation_target AS actor_id
-  FROM
-    (SELECT aggregation_target,
-            steps,
-            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
-            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
-            median(step_1_conversion_time) step_1_median_conversion_time_inner,
-            median(step_2_conversion_time) step_2_median_conversion_time_inner ,
-            prop
-     FROM
-       (SELECT aggregation_target,
-               steps,
-               max(steps) over (PARTITION BY aggregation_target,
-                                             prop) as max_steps,
-                               step_1_conversion_time,
-                               step_2_conversion_time ,
-                               prop
-        FROM
-          (SELECT *,
-                  if(latest_0 <= latest_1
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY
-                     AND latest_1 <= latest_2
-                     AND latest_2 <= latest_0 + INTERVAL 7 DAY, 3, if(latest_0 <= latest_1
-                                                                      AND latest_1 <= latest_0 + INTERVAL 7 DAY, 2, 1)) AS steps ,
-                  if(isNotNull(latest_1)
-                     AND latest_1 <= latest_0 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_0), toDateTime(latest_1)), NULL) step_1_conversion_time,
-                  if(isNotNull(latest_2)
-                     AND latest_2 <= latest_1 + INTERVAL 7 DAY, dateDiff('second', toDateTime(latest_1), toDateTime(latest_2)), NULL) step_2_conversion_time,
-                  prop
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    latest_1,
-                                                    step_2,
-                                                    min(latest_2) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
-                                                                       prop
-              FROM
-                (SELECT aggregation_target, timestamp, step_0,
-                                                       latest_0,
-                                                       step_1,
-                                                       latest_1,
-                                                       step_2,
-                                                       if(latest_2 < latest_1, NULL, latest_2) as latest_2 ,
-                                                       prop
-                 FROM
-                   (SELECT aggregation_target, timestamp, step_0,
-                                                          latest_0,
-                                                          step_1,
-                                                          min(latest_1) over (PARTITION by aggregation_target,
-                                                                                           prop
-                                                                              ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
-                                                                             step_2,
-                                                                             min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                              prop
-                                                                                                 ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
-                                                                                                if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-                    FROM
-                      (SELECT *,
-                              prop_vals as prop
-                       FROM
-                         (SELECT e.timestamp as timestamp,
-                                 if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                                 if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                                 if(event = 'sign up', 1, 0) as step_0,
-                                 if(step_0 = 1, timestamp, null) as latest_0,
-                                 if(event = 'play movie', 1, 0) as step_1,
-                                 if(step_1 = 1, timestamp, null) as latest_1,
-                                 if(event = 'buy', 1, 0) as step_2,
-                                 if(step_2 = 1, timestamp, null) as latest_2,
-                                 replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                                 prop_basic as prop,
-                                 argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                          FROM events e
-                          LEFT OUTER JOIN
-                            (SELECT distinct_id,
-                                    argMax(person_id, version) as person_id
-                             FROM person_distinct_id2
-                             WHERE team_id = 2
-                               AND distinct_id IN
-                                 (SELECT distinct_id
-                                  FROM events
-                                  WHERE team_id = 2
-                                    AND event IN ['buy', 'play movie', 'sign up']
-                                    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                                    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                             GROUP BY distinct_id
-                             HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                          LEFT JOIN
-                            (SELECT group_key,
-                                    argMax(group_properties, _timestamp) AS group_properties_0
-                             FROM groups
-                             WHERE team_id = 2
-                               AND group_type_index = 0
-                             GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                          WHERE team_id = 2
-                            AND event IN ['buy', 'play movie', 'sign up']
-                            AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                            AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                            AND (step_0 = 1
-                                 OR step_1 = 1
-                                 OR step_2 = 1) )))))
-           WHERE step_0 = 1 ))
-     GROUP BY aggregation_target,
-              steps,
-              max_steps,
-              prop
-     HAVING steps = max_steps)
-  WHERE steps IN [2, 3]
-    AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
-  ORDER BY aggregation_target
-  LIMIT 100
-  OFFSET 0 SETTINGS max_ast_elements=1000000,
-                    max_expanded_ast_elements=1000000
-  '''
-# ---
diff --git a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_unordered.ambr b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_unordered.ambr
deleted file mode 100644
index 28cb1da3d5303..0000000000000
--- a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_unordered.ambr
+++ /dev/null
@@ -1,2425 +0,0 @@
-# serializer version: 1
-# name: TestFunnelUnorderedStepsBreakdown.test_funnel_breakdown_correct_breakdown_props_are_chosen
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         if(isNaN(avgArrayOrNull(step_1_conversion_time_array) AS inter_1_conversion), NULL, inter_1_conversion) AS step_1_average_conversion_time,
-         if(isNaN(medianArrayOrNull(step_1_conversion_time_array) AS inter_1_median), NULL, inter_1_median) AS step_1_median_conversion_time,
-         if(ifNull(less(row_number, 26), 0), prop, ['Other']) AS final_prop
-  FROM
-    (SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
-            countIf(ifNull(equals(steps, 2), 0)) AS step_2,
-            groupArray(step_1_conversion_time) AS step_1_conversion_time_array,
-            prop AS prop,
-            row_number() OVER (
-                               ORDER BY step_2 DESC) AS row_number
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               steps AS steps,
-               prop AS prop,
-               prop AS prop,
-               min(step_1_conversion_time) AS step_1_conversion_time
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  prop AS prop,
-                  max(steps) OVER (PARTITION BY aggregation_target,
-                                                prop) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  prop AS prop
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     prop AS prop,
-                     arraySort([latest_0, latest_1]) AS event_times,
-                     arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                     arraySort([latest_0, latest_1]) AS conversion_times,
-                     if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           prop_basic AS prop_basic,
-                           prop,
-                           prop_vals AS prop_vals,
-                           if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, ['']) AS prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(and(equals(e.event, 'buy'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), 'xyz'), 0)), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              [ifNull(toString(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', '')), '')] AS prop_basic,
-                              prop_basic AS prop,
-                              argMinIf(prop, timestamp, notEmpty(arrayFilter(x -> notEmpty(x), prop))) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))))
-              WHERE ifNull(equals(step_0, 1), 0)
-              UNION ALL SELECT aggregation_target AS aggregation_target,
-                               timestamp AS timestamp,
-                               step_0 AS step_0,
-                               latest_0 AS latest_0,
-                               step_1 AS step_1,
-                               latest_1 AS latest_1,
-                               prop AS prop,
-                               arraySort([latest_0, latest_1]) AS event_times,
-                               arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                               arraySort([latest_0, latest_1]) AS conversion_times,
-                               if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           prop_basic AS prop_basic,
-                           prop,
-                           prop_vals AS prop_vals,
-                           if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, ['']) AS prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              if(and(equals(e.event, 'buy'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), 'xyz'), 0)), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              [ifNull(toString(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', '')), '')] AS prop_basic,
-                              prop_basic AS prop,
-                              argMinIf(prop, timestamp, notEmpty(arrayFilter(x -> notEmpty(x), prop))) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps,
-                 prop
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps))))
-     GROUP BY prop)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelUnorderedStepsBreakdown.test_funnel_breakdown_correct_breakdown_props_are_chosen_for_step
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         if(isNaN(avgArrayOrNull(step_1_conversion_time_array) AS inter_1_conversion), NULL, inter_1_conversion) AS step_1_average_conversion_time,
-         if(isNaN(medianArrayOrNull(step_1_conversion_time_array) AS inter_1_median), NULL, inter_1_median) AS step_1_median_conversion_time,
-         if(ifNull(less(row_number, 26), 0), prop, ['Other']) AS final_prop
-  FROM
-    (SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
-            countIf(ifNull(equals(steps, 2), 0)) AS step_2,
-            groupArray(step_1_conversion_time) AS step_1_conversion_time_array,
-            prop AS prop,
-            row_number() OVER (
-                               ORDER BY step_2 DESC) AS row_number
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               steps AS steps,
-               prop AS prop,
-               prop AS prop,
-               min(step_1_conversion_time) AS step_1_conversion_time
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  prop AS prop,
-                  max(steps) OVER (PARTITION BY aggregation_target,
-                                                prop) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  prop AS prop
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     prop AS prop,
-                     arraySort([latest_0, latest_1]) AS event_times,
-                     arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                     arraySort([latest_0, latest_1]) AS conversion_times,
-                     if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           prop_basic AS prop_basic,
-                           prop_0 AS prop_0,
-                           prop_1 AS prop_1,
-                           prop,
-                           prop_vals AS prop_vals,
-                           prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(and(equals(e.event, 'buy'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), 'xyz'), 0)), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              [ifNull(toString(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', '')), '')] AS prop_basic,
-                              if(ifNull(equals(step_0, 1), 0), prop_basic, []) AS prop_0,
-                              if(ifNull(equals(step_1, 1), 0), prop_basic, []) AS prop_1,
-                              prop_1 AS prop,
-                              groupUniqArray(prop) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0)))) ARRAY
-                    JOIN prop_vals AS prop
-                    WHERE ifNull(notEquals(prop, []), isNotNull(prop)
-                                 or isNotNull([]))))
-              WHERE ifNull(equals(step_0, 1), 0)
-              UNION ALL SELECT aggregation_target AS aggregation_target,
-                               timestamp AS timestamp,
-                               step_0 AS step_0,
-                               latest_0 AS latest_0,
-                               step_1 AS step_1,
-                               latest_1 AS latest_1,
-                               prop AS prop,
-                               arraySort([latest_0, latest_1]) AS event_times,
-                               arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                               arraySort([latest_0, latest_1]) AS conversion_times,
-                               if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           prop_basic AS prop_basic,
-                           prop_0 AS prop_0,
-                           prop_1 AS prop_1,
-                           prop,
-                           prop_vals AS prop_vals,
-                           prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              if(and(equals(e.event, 'buy'), ifNull(equals(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', ''), 'xyz'), 0)), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              [ifNull(toString(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', '')), '')] AS prop_basic,
-                              if(ifNull(equals(step_0, 1), 0), prop_basic, []) AS prop_0,
-                              if(ifNull(equals(step_1, 1), 0), prop_basic, []) AS prop_1,
-                              prop_1 AS prop,
-                              groupUniqArray(prop) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0)))) ARRAY
-                    JOIN prop_vals AS prop
-                    WHERE ifNull(notEquals(prop, []), isNotNull(prop)
-                                 or isNotNull([]))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps,
-                 prop
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps))))
-     GROUP BY prop)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestFunnelUnorderedStepsBreakdown.test_funnel_step_multiple_breakdown_snapshot
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         if(isNaN(avgArrayOrNull(step_1_conversion_time_array) AS inter_1_conversion), NULL, inter_1_conversion) AS step_1_average_conversion_time,
-         if(isNaN(medianArrayOrNull(step_1_conversion_time_array) AS inter_1_median), NULL, inter_1_median) AS step_1_median_conversion_time,
-         if(ifNull(less(row_number, 26), 0), prop, ['Other']) AS final_prop
-  FROM
-    (SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
-            countIf(ifNull(equals(steps, 2), 0)) AS step_2,
-            groupArray(step_1_conversion_time) AS step_1_conversion_time_array,
-            prop AS prop,
-            row_number() OVER (
-                               ORDER BY step_2 DESC) AS row_number
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               steps AS steps,
-               prop AS prop,
-               prop AS prop,
-               min(step_1_conversion_time) AS step_1_conversion_time
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  prop AS prop,
-                  max(steps) OVER (PARTITION BY aggregation_target,
-                                                prop) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  prop AS prop
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     prop AS prop,
-                     arraySort([latest_0, latest_1]) AS event_times,
-                     arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                     arraySort([latest_0, latest_1]) AS conversion_times,
-                     if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           prop_basic AS prop_basic,
-                           prop,
-                           prop_vals AS prop_vals,
-                           if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, ['', '']) AS prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'buy'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              [ifNull(toString(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', '')), ''), ifNull(toString(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', '')), '')] AS prop_basic,
-                              prop_basic AS prop,
-                              argMinIf(prop, timestamp, notEmpty(arrayFilter(x -> notEmpty(x), prop))) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))))
-              WHERE ifNull(equals(step_0, 1), 0)
-              UNION ALL SELECT aggregation_target AS aggregation_target,
-                               timestamp AS timestamp,
-                               step_0 AS step_0,
-                               latest_0 AS latest_0,
-                               step_1 AS step_1,
-                               latest_1 AS latest_1,
-                               prop AS prop,
-                               arraySort([latest_0, latest_1]) AS event_times,
-                               arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                               arraySort([latest_0, latest_1]) AS conversion_times,
-                               if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           prop_basic AS prop_basic,
-                           prop,
-                           prop_vals AS prop_vals,
-                           if(notEmpty(arrayFilter(x -> notEmpty(x), prop_vals)), prop_vals, ['', '']) AS prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              if(equals(e.event, 'buy'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              [ifNull(toString(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$browser'), ''), 'null'), '^"|"$', '')), ''), ifNull(toString(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(e.properties, '$version'), ''), 'null'), '^"|"$', '')), '')] AS prop_basic,
-                              prop_basic AS prop,
-                              argMinIf(prop, timestamp, notEmpty(arrayFilter(x -> notEmpty(x), prop))) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0))))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps,
-                 prop
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps))))
-     GROUP BY prop)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestUnorderedFunnelGroupBreakdown.test_funnel_aggregate_by_groups_breakdown_group_person_on_events
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         sum(step_3) AS step_3,
-         if(isNaN(avgArrayOrNull(step_1_conversion_time_array) AS inter_1_conversion), NULL, inter_1_conversion) AS step_1_average_conversion_time,
-         if(isNaN(avgArrayOrNull(step_2_conversion_time_array) AS inter_2_conversion), NULL, inter_2_conversion) AS step_2_average_conversion_time,
-         if(isNaN(medianArrayOrNull(step_1_conversion_time_array) AS inter_1_median), NULL, inter_1_median) AS step_1_median_conversion_time,
-         if(isNaN(medianArrayOrNull(step_2_conversion_time_array) AS inter_2_median), NULL, inter_2_median) AS step_2_median_conversion_time,
-         if(ifNull(less(row_number, 26), 0), prop, 'Other') AS final_prop
-  FROM
-    (SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
-            countIf(ifNull(equals(steps, 2), 0)) AS step_2,
-            countIf(ifNull(equals(steps, 3), 0)) AS step_3,
-            groupArray(step_1_conversion_time) AS step_1_conversion_time_array,
-            groupArray(step_2_conversion_time) AS step_2_conversion_time_array,
-            prop AS prop,
-            row_number() OVER (
-                               ORDER BY step_3 DESC) AS row_number
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               steps AS steps,
-               prop AS prop,
-               prop AS prop,
-               min(step_1_conversion_time) AS step_1_conversion_time,
-               min(step_2_conversion_time) AS step_2_conversion_time
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  prop AS prop,
-                  max(steps) OVER (PARTITION BY aggregation_target,
-                                                prop) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  step_2_conversion_time AS step_2_conversion_time,
-                                  prop AS prop
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     step_2 AS step_2,
-                     latest_2 AS latest_2,
-                     prop AS prop,
-                     arraySort([latest_0, latest_1, latest_2]) AS event_times,
-                     arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                     arraySort([latest_0, latest_1, latest_2]) AS conversion_times,
-                     if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time,
-                     if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           step_2 AS step_2,
-                                           min(latest_2) OVER (PARTITION BY aggregation_target,
-                                                                            prop
-                                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                                              prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           step_2 AS step_2,
-                           latest_2 AS latest_2,
-                           prop_basic AS prop_basic,
-                           prop,
-                           prop_vals AS prop_vals,
-                           prop_vals AS prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              e.`$group_0` AS aggregation_target,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'play movie'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(equals(e.event, 'buy'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                              ifNull(toString(e__group_0.properties___industry), '') AS prop_basic,
-                              prop_basic AS prop,
-                              argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT JOIN
-                         (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                                 groups.group_type_index AS index,
-                                 groups.group_key AS key
-                          FROM groups
-                          WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                          GROUP BY groups.group_type_index,
-                                   groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))))
-              WHERE ifNull(equals(step_0, 1), 0)
-              UNION ALL SELECT aggregation_target AS aggregation_target,
-                               timestamp AS timestamp,
-                               step_0 AS step_0,
-                               latest_0 AS latest_0,
-                               step_1 AS step_1,
-                               latest_1 AS latest_1,
-                               step_2 AS step_2,
-                               latest_2 AS latest_2,
-                               prop AS prop,
-                               arraySort([latest_0, latest_1, latest_2]) AS event_times,
-                               arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                               arraySort([latest_0, latest_1, latest_2]) AS conversion_times,
-                               if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time,
-                               if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           step_2 AS step_2,
-                                           min(latest_2) OVER (PARTITION BY aggregation_target,
-                                                                            prop
-                                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                                              prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           step_2 AS step_2,
-                           latest_2 AS latest_2,
-                           prop_basic AS prop_basic,
-                           prop,
-                           prop_vals AS prop_vals,
-                           prop_vals AS prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              e.`$group_0` AS aggregation_target,
-                              if(equals(e.event, 'play movie'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'buy'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                              ifNull(toString(e__group_0.properties___industry), '') AS prop_basic,
-                              prop_basic AS prop,
-                              argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT JOIN
-                         (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                                 groups.group_type_index AS index,
-                                 groups.group_key AS key
-                          FROM groups
-                          WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                          GROUP BY groups.group_type_index,
-                                   groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))))
-              WHERE ifNull(equals(step_0, 1), 0)
-              UNION ALL SELECT aggregation_target AS aggregation_target,
-                               timestamp AS timestamp,
-                               step_0 AS step_0,
-                               latest_0 AS latest_0,
-                               step_1 AS step_1,
-                               latest_1 AS latest_1,
-                               step_2 AS step_2,
-                               latest_2 AS latest_2,
-                               prop AS prop,
-                               arraySort([latest_0, latest_1, latest_2]) AS event_times,
-                               arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                               arraySort([latest_0, latest_1, latest_2]) AS conversion_times,
-                               if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time,
-                               if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           step_2 AS step_2,
-                                           min(latest_2) OVER (PARTITION BY aggregation_target,
-                                                                            prop
-                                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                                              prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           step_2 AS step_2,
-                           latest_2 AS latest_2,
-                           prop_basic AS prop_basic,
-                           prop,
-                           prop_vals AS prop_vals,
-                           prop_vals AS prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              e.`$group_0` AS aggregation_target,
-                              if(equals(e.event, 'buy'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(equals(e.event, 'play movie'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                              ifNull(toString(e__group_0.properties___industry), '') AS prop_basic,
-                              prop_basic AS prop,
-                              argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT JOIN
-                         (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                                 groups.group_type_index AS index,
-                                 groups.group_key AS key
-                          FROM groups
-                          WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                          GROUP BY groups.group_type_index,
-                                   groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps,
-                 prop
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps))))
-     GROUP BY prop)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestUnorderedFunnelGroupBreakdown.test_funnel_aggregate_by_groups_breakdown_group_person_on_events_poe_v2
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         sum(step_3) AS step_3,
-         if(isNaN(avgArrayOrNull(step_1_conversion_time_array) AS inter_1_conversion), NULL, inter_1_conversion) AS step_1_average_conversion_time,
-         if(isNaN(avgArrayOrNull(step_2_conversion_time_array) AS inter_2_conversion), NULL, inter_2_conversion) AS step_2_average_conversion_time,
-         if(isNaN(medianArrayOrNull(step_1_conversion_time_array) AS inter_1_median), NULL, inter_1_median) AS step_1_median_conversion_time,
-         if(isNaN(medianArrayOrNull(step_2_conversion_time_array) AS inter_2_median), NULL, inter_2_median) AS step_2_median_conversion_time,
-         if(ifNull(less(row_number, 26), 0), prop, 'Other') AS final_prop
-  FROM
-    (SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
-            countIf(ifNull(equals(steps, 2), 0)) AS step_2,
-            countIf(ifNull(equals(steps, 3), 0)) AS step_3,
-            groupArray(step_1_conversion_time) AS step_1_conversion_time_array,
-            groupArray(step_2_conversion_time) AS step_2_conversion_time_array,
-            prop AS prop,
-            row_number() OVER (
-                               ORDER BY step_3 DESC) AS row_number
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               steps AS steps,
-               prop AS prop,
-               prop AS prop,
-               min(step_1_conversion_time) AS step_1_conversion_time,
-               min(step_2_conversion_time) AS step_2_conversion_time
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  prop AS prop,
-                  max(steps) OVER (PARTITION BY aggregation_target,
-                                                prop) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  step_2_conversion_time AS step_2_conversion_time,
-                                  prop AS prop
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     step_2 AS step_2,
-                     latest_2 AS latest_2,
-                     prop AS prop,
-                     arraySort([latest_0, latest_1, latest_2]) AS event_times,
-                     arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                     arraySort([latest_0, latest_1, latest_2]) AS conversion_times,
-                     if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time,
-                     if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           step_2 AS step_2,
-                                           min(latest_2) OVER (PARTITION BY aggregation_target,
-                                                                            prop
-                                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                                              prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           step_2 AS step_2,
-                           latest_2 AS latest_2,
-                           prop_basic AS prop_basic,
-                           prop,
-                           prop_vals AS prop_vals,
-                           prop_vals AS prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              e.`$group_0` AS aggregation_target,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'play movie'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(equals(e.event, 'buy'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                              ifNull(toString(e__group_0.properties___industry), '') AS prop_basic,
-                              prop_basic AS prop,
-                              argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT JOIN
-                         (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                                 groups.group_type_index AS index,
-                                 groups.group_key AS key
-                          FROM groups
-                          WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                          GROUP BY groups.group_type_index,
-                                   groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))))
-              WHERE ifNull(equals(step_0, 1), 0)
-              UNION ALL SELECT aggregation_target AS aggregation_target,
-                               timestamp AS timestamp,
-                               step_0 AS step_0,
-                               latest_0 AS latest_0,
-                               step_1 AS step_1,
-                               latest_1 AS latest_1,
-                               step_2 AS step_2,
-                               latest_2 AS latest_2,
-                               prop AS prop,
-                               arraySort([latest_0, latest_1, latest_2]) AS event_times,
-                               arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                               arraySort([latest_0, latest_1, latest_2]) AS conversion_times,
-                               if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time,
-                               if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           step_2 AS step_2,
-                                           min(latest_2) OVER (PARTITION BY aggregation_target,
-                                                                            prop
-                                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                                              prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           step_2 AS step_2,
-                           latest_2 AS latest_2,
-                           prop_basic AS prop_basic,
-                           prop,
-                           prop_vals AS prop_vals,
-                           prop_vals AS prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              e.`$group_0` AS aggregation_target,
-                              if(equals(e.event, 'play movie'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'buy'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                              ifNull(toString(e__group_0.properties___industry), '') AS prop_basic,
-                              prop_basic AS prop,
-                              argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT JOIN
-                         (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                                 groups.group_type_index AS index,
-                                 groups.group_key AS key
-                          FROM groups
-                          WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                          GROUP BY groups.group_type_index,
-                                   groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))))
-              WHERE ifNull(equals(step_0, 1), 0)
-              UNION ALL SELECT aggregation_target AS aggregation_target,
-                               timestamp AS timestamp,
-                               step_0 AS step_0,
-                               latest_0 AS latest_0,
-                               step_1 AS step_1,
-                               latest_1 AS latest_1,
-                               step_2 AS step_2,
-                               latest_2 AS latest_2,
-                               prop AS prop,
-                               arraySort([latest_0, latest_1, latest_2]) AS event_times,
-                               arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                               arraySort([latest_0, latest_1, latest_2]) AS conversion_times,
-                               if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time,
-                               if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           step_2 AS step_2,
-                                           min(latest_2) OVER (PARTITION BY aggregation_target,
-                                                                            prop
-                                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                                              prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           step_2 AS step_2,
-                           latest_2 AS latest_2,
-                           prop_basic AS prop_basic,
-                           prop,
-                           prop_vals AS prop_vals,
-                           prop_vals AS prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              e.`$group_0` AS aggregation_target,
-                              if(equals(e.event, 'buy'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(equals(e.event, 'play movie'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                              ifNull(toString(e__group_0.properties___industry), '') AS prop_basic,
-                              prop_basic AS prop,
-                              argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT JOIN
-                         (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                                 groups.group_type_index AS index,
-                                 groups.group_key AS key
-                          FROM groups
-                          WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                          GROUP BY groups.group_type_index,
-                                   groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps,
-                 prop
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps))))
-     GROUP BY prop)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group
-  '''
-  SELECT sum(step_1) AS step_1,
-         sum(step_2) AS step_2,
-         sum(step_3) AS step_3,
-         if(isNaN(avgArrayOrNull(step_1_conversion_time_array) AS inter_1_conversion), NULL, inter_1_conversion) AS step_1_average_conversion_time,
-         if(isNaN(avgArrayOrNull(step_2_conversion_time_array) AS inter_2_conversion), NULL, inter_2_conversion) AS step_2_average_conversion_time,
-         if(isNaN(medianArrayOrNull(step_1_conversion_time_array) AS inter_1_median), NULL, inter_1_median) AS step_1_median_conversion_time,
-         if(isNaN(medianArrayOrNull(step_2_conversion_time_array) AS inter_2_median), NULL, inter_2_median) AS step_2_median_conversion_time,
-         if(ifNull(less(row_number, 26), 0), prop, 'Other') AS final_prop
-  FROM
-    (SELECT countIf(ifNull(equals(steps, 1), 0)) AS step_1,
-            countIf(ifNull(equals(steps, 2), 0)) AS step_2,
-            countIf(ifNull(equals(steps, 3), 0)) AS step_3,
-            groupArray(step_1_conversion_time) AS step_1_conversion_time_array,
-            groupArray(step_2_conversion_time) AS step_2_conversion_time_array,
-            prop AS prop,
-            row_number() OVER (
-                               ORDER BY step_3 DESC) AS row_number
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               steps AS steps,
-               prop AS prop,
-               prop AS prop,
-               min(step_1_conversion_time) AS step_1_conversion_time,
-               min(step_2_conversion_time) AS step_2_conversion_time
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  prop AS prop,
-                  max(steps) OVER (PARTITION BY aggregation_target,
-                                                prop) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  step_2_conversion_time AS step_2_conversion_time,
-                                  prop AS prop
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     step_2 AS step_2,
-                     latest_2 AS latest_2,
-                     prop AS prop,
-                     arraySort([latest_0, latest_1, latest_2]) AS event_times,
-                     arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                     arraySort([latest_0, latest_1, latest_2]) AS conversion_times,
-                     if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time,
-                     if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           step_2 AS step_2,
-                                           min(latest_2) OVER (PARTITION BY aggregation_target,
-                                                                            prop
-                                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                                              prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           step_2 AS step_2,
-                           latest_2 AS latest_2,
-                           prop_basic AS prop_basic,
-                           prop,
-                           prop_vals AS prop_vals,
-                           prop_vals AS prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'play movie'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(equals(e.event, 'buy'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                              ifNull(toString(e__group_0.properties___industry), '') AS prop_basic,
-                              prop_basic AS prop,
-                              argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       LEFT JOIN
-                         (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                                 groups.group_type_index AS index,
-                                 groups.group_key AS key
-                          FROM groups
-                          WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                          GROUP BY groups.group_type_index,
-                                   groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))))
-              WHERE ifNull(equals(step_0, 1), 0)
-              UNION ALL SELECT aggregation_target AS aggregation_target,
-                               timestamp AS timestamp,
-                               step_0 AS step_0,
-                               latest_0 AS latest_0,
-                               step_1 AS step_1,
-                               latest_1 AS latest_1,
-                               step_2 AS step_2,
-                               latest_2 AS latest_2,
-                               prop AS prop,
-                               arraySort([latest_0, latest_1, latest_2]) AS event_times,
-                               arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                               arraySort([latest_0, latest_1, latest_2]) AS conversion_times,
-                               if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time,
-                               if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           step_2 AS step_2,
-                                           min(latest_2) OVER (PARTITION BY aggregation_target,
-                                                                            prop
-                                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                                              prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           step_2 AS step_2,
-                           latest_2 AS latest_2,
-                           prop_basic AS prop_basic,
-                           prop,
-                           prop_vals AS prop_vals,
-                           prop_vals AS prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              if(equals(e.event, 'play movie'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'buy'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                              ifNull(toString(e__group_0.properties___industry), '') AS prop_basic,
-                              prop_basic AS prop,
-                              argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       LEFT JOIN
-                         (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                                 groups.group_type_index AS index,
-                                 groups.group_key AS key
-                          FROM groups
-                          WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                          GROUP BY groups.group_type_index,
-                                   groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))))
-              WHERE ifNull(equals(step_0, 1), 0)
-              UNION ALL SELECT aggregation_target AS aggregation_target,
-                               timestamp AS timestamp,
-                               step_0 AS step_0,
-                               latest_0 AS latest_0,
-                               step_1 AS step_1,
-                               latest_1 AS latest_1,
-                               step_2 AS step_2,
-                               latest_2 AS latest_2,
-                               prop AS prop,
-                               arraySort([latest_0, latest_1, latest_2]) AS event_times,
-                               arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                               arraySort([latest_0, latest_1, latest_2]) AS conversion_times,
-                               if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time,
-                               if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target,
-                                                         prop
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           step_2 AS step_2,
-                                           min(latest_2) OVER (PARTITION BY aggregation_target,
-                                                                            prop
-                                                               ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                                              prop AS prop
-                 FROM
-                   (SELECT timestamp AS timestamp,
-                           aggregation_target AS aggregation_target,
-                           step_0 AS step_0,
-                           latest_0 AS latest_0,
-                           step_1 AS step_1,
-                           latest_1 AS latest_1,
-                           step_2 AS step_2,
-                           latest_2 AS latest_2,
-                           prop_basic AS prop_basic,
-                           prop,
-                           prop_vals AS prop_vals,
-                           prop_vals AS prop
-                    FROM
-                      (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                              if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                              if(equals(e.event, 'buy'), 1, 0) AS step_0,
-                              if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                              if(equals(e.event, 'sign up'), 1, 0) AS step_1,
-                              if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                              if(equals(e.event, 'play movie'), 1, 0) AS step_2,
-                              if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                              ifNull(toString(e__group_0.properties___industry), '') AS prop_basic,
-                              prop_basic AS prop,
-                              argMinIf(prop, timestamp, isNotNull(prop)) OVER (PARTITION BY aggregation_target) AS prop_vals
-                       FROM events AS e
-                       LEFT OUTER JOIN
-                         (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                                 person_distinct_id_overrides.distinct_id AS distinct_id
-                          FROM person_distinct_id_overrides
-                          WHERE equals(person_distinct_id_overrides.team_id, 2)
-                          GROUP BY person_distinct_id_overrides.distinct_id
-                          HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                       LEFT JOIN
-                         (SELECT argMax(replaceRegexpAll(nullIf(nullIf(JSONExtractRaw(groups.group_properties, 'industry'), ''), 'null'), '^"|"$', ''), toTimeZone(groups._timestamp, 'UTC')) AS properties___industry,
-                                 groups.group_type_index AS index,
-                                 groups.group_key AS key
-                          FROM groups
-                          WHERE and(equals(groups.team_id, 2), equals(index, 0))
-                          GROUP BY groups.group_type_index,
-                                   groups.group_key) AS e__group_0 ON equals(e.`$group_0`, e__group_0.key)
-                       WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2020-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('buy', 'play movie', 'sign up'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0))))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps,
-                 prop
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps))))
-     GROUP BY prop)
-  GROUP BY final_prop
-  LIMIT 100 SETTINGS readonly=2,
-                     max_execution_time=60,
-                     allow_experimental_object_type=1,
-                     format_csv_allow_double_quotes=0,
-                     max_ast_elements=4000000,
-                     max_expanded_ast_elements=4000000,
-                     max_bytes_before_external_group_by=23622320128,
-                     allow_experimental_analyzer=1
-  '''
-# ---
-# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.1
-  '''
-  
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.10
-  '''
-  
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.11
-  '''
-  
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.12
-  '''
-  
-  SELECT aggregation_target AS actor_id
-  FROM
-    (SELECT aggregation_target,
-            steps,
-            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
-            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
-            median(step_1_conversion_time) step_1_median_conversion_time_inner,
-            median(step_2_conversion_time) step_2_median_conversion_time_inner,
-            prop
-     FROM
-       (SELECT aggregation_target,
-               steps,
-               max(steps) over (PARTITION BY aggregation_target,
-                                             prop) as max_steps,
-                               step_1_conversion_time,
-                               step_2_conversion_time,
-                               prop
-        FROM
-          (SELECT *,
-                  arraySort([latest_0,latest_1,latest_2]) as event_times,
-                  arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
-                  arraySort([latest_0,latest_1,latest_2]) as conversion_times,
-                  if(isNotNull(conversion_times[2])
-                     AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
-                  if(isNotNull(conversion_times[3])
-                     AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
-                                                                       step_2,
-                                                                       min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                        prop
-                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
-                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-              FROM
-                (SELECT *,
-                        prop_vals as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'sign up', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'play movie', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'buy', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2,
-                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND event IN ['buy', 'play movie', 'sign up']
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    LEFT JOIN
-                      (SELECT group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                       FROM groups
-                       WHERE team_id = 2
-                         AND group_type_index = 0
-                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                    WHERE team_id = 2
-                      AND event IN ['buy', 'play movie', 'sign up']
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                      AND (step_0 = 1
-                           OR step_1 = 1
-                           OR step_2 = 1) )))
-           WHERE step_0 = 1
-           UNION ALL SELECT *,
-                            arraySort([latest_0,latest_1,latest_2]) as event_times,
-                            arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
-                            arraySort([latest_0,latest_1,latest_2]) as conversion_times,
-                            if(isNotNull(conversion_times[2])
-                               AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
-                            if(isNotNull(conversion_times[3])
-                               AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
-                                                                       step_2,
-                                                                       min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                        prop
-                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
-                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-              FROM
-                (SELECT *,
-                        prop_vals as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'play movie', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'buy', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'sign up', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2,
-                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND event IN ['buy', 'play movie', 'sign up']
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    LEFT JOIN
-                      (SELECT group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                       FROM groups
-                       WHERE team_id = 2
-                         AND group_type_index = 0
-                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                    WHERE team_id = 2
-                      AND event IN ['buy', 'play movie', 'sign up']
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                      AND (step_0 = 1
-                           OR step_1 = 1
-                           OR step_2 = 1) )))
-           WHERE step_0 = 1
-           UNION ALL SELECT *,
-                            arraySort([latest_0,latest_1,latest_2]) as event_times,
-                            arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
-                            arraySort([latest_0,latest_1,latest_2]) as conversion_times,
-                            if(isNotNull(conversion_times[2])
-                               AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
-                            if(isNotNull(conversion_times[3])
-                               AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
-                                                                       step_2,
-                                                                       min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                        prop
-                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
-                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-              FROM
-                (SELECT *,
-                        prop_vals as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'buy', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'sign up', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'play movie', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2,
-                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND event IN ['buy', 'play movie', 'sign up']
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    LEFT JOIN
-                      (SELECT group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                       FROM groups
-                       WHERE team_id = 2
-                         AND group_type_index = 0
-                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                    WHERE team_id = 2
-                      AND event IN ['buy', 'play movie', 'sign up']
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                      AND (step_0 = 1
-                           OR step_1 = 1
-                           OR step_2 = 1) )))
-           WHERE step_0 = 1 ))
-     GROUP BY aggregation_target,
-              steps,
-              max_steps,
-              prop
-     HAVING steps = max_steps)
-  WHERE steps IN [1, 2, 3]
-    AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
-  ORDER BY aggregation_target
-  LIMIT 100
-  OFFSET 0 SETTINGS max_ast_elements=1000000,
-                    max_expanded_ast_elements=1000000
-  '''
-# ---
-# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.13
-  '''
-  
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.14
-  '''
-  
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.15
-  '''
-  
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.16
-  '''
-  
-  SELECT aggregation_target AS actor_id
-  FROM
-    (SELECT aggregation_target,
-            steps,
-            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
-            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
-            median(step_1_conversion_time) step_1_median_conversion_time_inner,
-            median(step_2_conversion_time) step_2_median_conversion_time_inner,
-            prop
-     FROM
-       (SELECT aggregation_target,
-               steps,
-               max(steps) over (PARTITION BY aggregation_target,
-                                             prop) as max_steps,
-                               step_1_conversion_time,
-                               step_2_conversion_time,
-                               prop
-        FROM
-          (SELECT *,
-                  arraySort([latest_0,latest_1,latest_2]) as event_times,
-                  arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
-                  arraySort([latest_0,latest_1,latest_2]) as conversion_times,
-                  if(isNotNull(conversion_times[2])
-                     AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
-                  if(isNotNull(conversion_times[3])
-                     AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
-                                                                       step_2,
-                                                                       min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                        prop
-                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
-                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-              FROM
-                (SELECT *,
-                        prop_vals as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'sign up', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'play movie', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'buy', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2,
-                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND event IN ['buy', 'play movie', 'sign up']
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    LEFT JOIN
-                      (SELECT group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                       FROM groups
-                       WHERE team_id = 2
-                         AND group_type_index = 0
-                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                    WHERE team_id = 2
-                      AND event IN ['buy', 'play movie', 'sign up']
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                      AND (step_0 = 1
-                           OR step_1 = 1
-                           OR step_2 = 1) )))
-           WHERE step_0 = 1
-           UNION ALL SELECT *,
-                            arraySort([latest_0,latest_1,latest_2]) as event_times,
-                            arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
-                            arraySort([latest_0,latest_1,latest_2]) as conversion_times,
-                            if(isNotNull(conversion_times[2])
-                               AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
-                            if(isNotNull(conversion_times[3])
-                               AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
-                                                                       step_2,
-                                                                       min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                        prop
-                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
-                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-              FROM
-                (SELECT *,
-                        prop_vals as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'play movie', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'buy', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'sign up', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2,
-                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND event IN ['buy', 'play movie', 'sign up']
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    LEFT JOIN
-                      (SELECT group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                       FROM groups
-                       WHERE team_id = 2
-                         AND group_type_index = 0
-                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                    WHERE team_id = 2
-                      AND event IN ['buy', 'play movie', 'sign up']
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                      AND (step_0 = 1
-                           OR step_1 = 1
-                           OR step_2 = 1) )))
-           WHERE step_0 = 1
-           UNION ALL SELECT *,
-                            arraySort([latest_0,latest_1,latest_2]) as event_times,
-                            arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
-                            arraySort([latest_0,latest_1,latest_2]) as conversion_times,
-                            if(isNotNull(conversion_times[2])
-                               AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
-                            if(isNotNull(conversion_times[3])
-                               AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
-                                                                       step_2,
-                                                                       min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                        prop
-                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
-                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-              FROM
-                (SELECT *,
-                        prop_vals as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'buy', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'sign up', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'play movie', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2,
-                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND event IN ['buy', 'play movie', 'sign up']
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    LEFT JOIN
-                      (SELECT group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                       FROM groups
-                       WHERE team_id = 2
-                         AND group_type_index = 0
-                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                    WHERE team_id = 2
-                      AND event IN ['buy', 'play movie', 'sign up']
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                      AND (step_0 = 1
-                           OR step_1 = 1
-                           OR step_2 = 1) )))
-           WHERE step_0 = 1 ))
-     GROUP BY aggregation_target,
-              steps,
-              max_steps,
-              prop
-     HAVING steps = max_steps)
-  WHERE steps IN [2, 3]
-    AND arrayFlatten(array(prop)) = arrayFlatten(array('technology'))
-  ORDER BY aggregation_target
-  LIMIT 100
-  OFFSET 0 SETTINGS max_ast_elements=1000000,
-                    max_expanded_ast_elements=1000000
-  '''
-# ---
-# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.2
-  '''
-  
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.3
-  '''
-  
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.4
-  '''
-  
-  SELECT aggregation_target AS actor_id
-  FROM
-    (SELECT aggregation_target,
-            steps,
-            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
-            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
-            median(step_1_conversion_time) step_1_median_conversion_time_inner,
-            median(step_2_conversion_time) step_2_median_conversion_time_inner,
-            prop
-     FROM
-       (SELECT aggregation_target,
-               steps,
-               max(steps) over (PARTITION BY aggregation_target,
-                                             prop) as max_steps,
-                               step_1_conversion_time,
-                               step_2_conversion_time,
-                               prop
-        FROM
-          (SELECT *,
-                  arraySort([latest_0,latest_1,latest_2]) as event_times,
-                  arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
-                  arraySort([latest_0,latest_1,latest_2]) as conversion_times,
-                  if(isNotNull(conversion_times[2])
-                     AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
-                  if(isNotNull(conversion_times[3])
-                     AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
-                                                                       step_2,
-                                                                       min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                        prop
-                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
-                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-              FROM
-                (SELECT *,
-                        prop_vals as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'sign up', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'play movie', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'buy', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2,
-                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND event IN ['buy', 'play movie', 'sign up']
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    LEFT JOIN
-                      (SELECT group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                       FROM groups
-                       WHERE team_id = 2
-                         AND group_type_index = 0
-                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                    WHERE team_id = 2
-                      AND event IN ['buy', 'play movie', 'sign up']
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                      AND (step_0 = 1
-                           OR step_1 = 1
-                           OR step_2 = 1) )))
-           WHERE step_0 = 1
-           UNION ALL SELECT *,
-                            arraySort([latest_0,latest_1,latest_2]) as event_times,
-                            arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
-                            arraySort([latest_0,latest_1,latest_2]) as conversion_times,
-                            if(isNotNull(conversion_times[2])
-                               AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
-                            if(isNotNull(conversion_times[3])
-                               AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
-                                                                       step_2,
-                                                                       min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                        prop
-                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
-                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-              FROM
-                (SELECT *,
-                        prop_vals as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'play movie', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'buy', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'sign up', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2,
-                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND event IN ['buy', 'play movie', 'sign up']
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    LEFT JOIN
-                      (SELECT group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                       FROM groups
-                       WHERE team_id = 2
-                         AND group_type_index = 0
-                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                    WHERE team_id = 2
-                      AND event IN ['buy', 'play movie', 'sign up']
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                      AND (step_0 = 1
-                           OR step_1 = 1
-                           OR step_2 = 1) )))
-           WHERE step_0 = 1
-           UNION ALL SELECT *,
-                            arraySort([latest_0,latest_1,latest_2]) as event_times,
-                            arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
-                            arraySort([latest_0,latest_1,latest_2]) as conversion_times,
-                            if(isNotNull(conversion_times[2])
-                               AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
-                            if(isNotNull(conversion_times[3])
-                               AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
-                                                                       step_2,
-                                                                       min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                        prop
-                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
-                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-              FROM
-                (SELECT *,
-                        prop_vals as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'buy', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'sign up', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'play movie', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2,
-                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND event IN ['buy', 'play movie', 'sign up']
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    LEFT JOIN
-                      (SELECT group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                       FROM groups
-                       WHERE team_id = 2
-                         AND group_type_index = 0
-                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                    WHERE team_id = 2
-                      AND event IN ['buy', 'play movie', 'sign up']
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                      AND (step_0 = 1
-                           OR step_1 = 1
-                           OR step_2 = 1) )))
-           WHERE step_0 = 1 ))
-     GROUP BY aggregation_target,
-              steps,
-              max_steps,
-              prop
-     HAVING steps = max_steps)
-  WHERE steps IN [1, 2, 3]
-    AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
-  ORDER BY aggregation_target
-  LIMIT 100
-  OFFSET 0 SETTINGS max_ast_elements=1000000,
-                    max_expanded_ast_elements=1000000
-  '''
-# ---
-# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.5
-  '''
-  
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.6
-  '''
-  
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.7
-  '''
-  
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
-# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.8
-  '''
-  
-  SELECT aggregation_target AS actor_id
-  FROM
-    (SELECT aggregation_target,
-            steps,
-            avg(step_1_conversion_time) step_1_average_conversion_time_inner,
-            avg(step_2_conversion_time) step_2_average_conversion_time_inner,
-            median(step_1_conversion_time) step_1_median_conversion_time_inner,
-            median(step_2_conversion_time) step_2_median_conversion_time_inner,
-            prop
-     FROM
-       (SELECT aggregation_target,
-               steps,
-               max(steps) over (PARTITION BY aggregation_target,
-                                             prop) as max_steps,
-                               step_1_conversion_time,
-                               step_2_conversion_time,
-                               prop
-        FROM
-          (SELECT *,
-                  arraySort([latest_0,latest_1,latest_2]) as event_times,
-                  arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
-                  arraySort([latest_0,latest_1,latest_2]) as conversion_times,
-                  if(isNotNull(conversion_times[2])
-                     AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
-                  if(isNotNull(conversion_times[3])
-                     AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
-                                                                       step_2,
-                                                                       min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                        prop
-                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
-                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-              FROM
-                (SELECT *,
-                        prop_vals as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'sign up', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'play movie', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'buy', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2,
-                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND event IN ['buy', 'play movie', 'sign up']
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    LEFT JOIN
-                      (SELECT group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                       FROM groups
-                       WHERE team_id = 2
-                         AND group_type_index = 0
-                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                    WHERE team_id = 2
-                      AND event IN ['buy', 'play movie', 'sign up']
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                      AND (step_0 = 1
-                           OR step_1 = 1
-                           OR step_2 = 1) )))
-           WHERE step_0 = 1
-           UNION ALL SELECT *,
-                            arraySort([latest_0,latest_1,latest_2]) as event_times,
-                            arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
-                            arraySort([latest_0,latest_1,latest_2]) as conversion_times,
-                            if(isNotNull(conversion_times[2])
-                               AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
-                            if(isNotNull(conversion_times[3])
-                               AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
-                                                                       step_2,
-                                                                       min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                        prop
-                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
-                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-              FROM
-                (SELECT *,
-                        prop_vals as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'play movie', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'buy', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'sign up', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2,
-                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND event IN ['buy', 'play movie', 'sign up']
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    LEFT JOIN
-                      (SELECT group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                       FROM groups
-                       WHERE team_id = 2
-                         AND group_type_index = 0
-                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                    WHERE team_id = 2
-                      AND event IN ['buy', 'play movie', 'sign up']
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                      AND (step_0 = 1
-                           OR step_1 = 1
-                           OR step_2 = 1) )))
-           WHERE step_0 = 1
-           UNION ALL SELECT *,
-                            arraySort([latest_0,latest_1,latest_2]) as event_times,
-                            arraySum([if(latest_0 < latest_1 AND latest_1 <= latest_0 + INTERVAL 7 DAY, 1, 0),if(latest_0 < latest_2 AND latest_2 <= latest_0 + INTERVAL 7 DAY, 1, 0), 1]) AS steps ,
-                            arraySort([latest_0,latest_1,latest_2]) as conversion_times,
-                            if(isNotNull(conversion_times[2])
-                               AND conversion_times[2] <= conversion_times[1] + INTERVAL 7 DAY, dateDiff('second', conversion_times[1], conversion_times[2]), NULL) step_1_conversion_time,
-                            if(isNotNull(conversion_times[3])
-                               AND conversion_times[3] <= conversion_times[2] + INTERVAL 7 DAY, dateDiff('second', conversion_times[2], conversion_times[3]), NULL) step_2_conversion_time
-           FROM
-             (SELECT aggregation_target, timestamp, step_0,
-                                                    latest_0,
-                                                    step_1,
-                                                    min(latest_1) over (PARTITION by aggregation_target,
-                                                                                     prop
-                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_1,
-                                                                       step_2,
-                                                                       min(latest_2) over (PARTITION by aggregation_target,
-                                                                                                        prop
-                                                                                           ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) latest_2 ,
-                                                                                          if(has(['technology', 'finance'], prop), prop, 'Other') as prop
-              FROM
-                (SELECT *,
-                        prop_vals as prop
-                 FROM
-                   (SELECT e.timestamp as timestamp,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as aggregation_target,
-                           if(notEmpty(pdi.distinct_id), pdi.person_id, e.person_id) as person_id,
-                           if(event = 'buy', 1, 0) as step_0,
-                           if(step_0 = 1, timestamp, null) as latest_0,
-                           if(event = 'sign up', 1, 0) as step_1,
-                           if(step_1 = 1, timestamp, null) as latest_1,
-                           if(event = 'play movie', 1, 0) as step_2,
-                           if(step_2 = 1, timestamp, null) as latest_2,
-                           replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS prop_basic,
-                           prop_basic as prop,
-                           argMinIf(prop, timestamp, isNotNull(prop)) over (PARTITION by aggregation_target) as prop_vals
-                    FROM events e
-                    LEFT OUTER JOIN
-                      (SELECT distinct_id,
-                              argMax(person_id, version) as person_id
-                       FROM person_distinct_id2
-                       WHERE team_id = 2
-                         AND distinct_id IN
-                           (SELECT distinct_id
-                            FROM events
-                            WHERE team_id = 2
-                              AND event IN ['buy', 'play movie', 'sign up']
-                              AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                              AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC') )
-                       GROUP BY distinct_id
-                       HAVING argMax(is_deleted, version) = 0) AS pdi ON e.distinct_id = pdi.distinct_id
-                    LEFT JOIN
-                      (SELECT group_key,
-                              argMax(group_properties, _timestamp) AS group_properties_0
-                       FROM groups
-                       WHERE team_id = 2
-                         AND group_type_index = 0
-                       GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-                    WHERE team_id = 2
-                      AND event IN ['buy', 'play movie', 'sign up']
-                      AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-                      AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-                      AND (step_0 = 1
-                           OR step_1 = 1
-                           OR step_2 = 1) )))
-           WHERE step_0 = 1 ))
-     GROUP BY aggregation_target,
-              steps,
-              max_steps,
-              prop
-     HAVING steps = max_steps)
-  WHERE steps IN [2, 3]
-    AND arrayFlatten(array(prop)) = arrayFlatten(array('finance'))
-  ORDER BY aggregation_target
-  LIMIT 100
-  OFFSET 0 SETTINGS max_ast_elements=1000000,
-                    max_expanded_ast_elements=1000000
-  '''
-# ---
-# name: TestUnorderedFunnelGroupBreakdown.test_funnel_breakdown_group.9
-  '''
-  
-  SELECT replaceRegexpAll(JSONExtractRaw(group_properties_0, 'industry'), '^"|"$', '') AS value,
-         count(*) as count
-  FROM events e
-  LEFT JOIN
-    (SELECT group_key,
-            argMax(group_properties, _timestamp) AS group_properties_0
-     FROM groups
-     WHERE team_id = 2
-       AND group_type_index = 0
-     GROUP BY group_key) groups_0 ON "$group_0" == groups_0.group_key
-  WHERE team_id = 2
-    AND event IN ['buy', 'play movie', 'sign up']
-    AND toTimeZone(timestamp, 'UTC') >= toDateTime('2020-01-01 00:00:00', 'UTC')
-    AND toTimeZone(timestamp, 'UTC') <= toDateTime('2020-01-08 23:59:59', 'UTC')
-  GROUP BY value
-  ORDER BY count DESC, value DESC
-  LIMIT 26
-  OFFSET 0
-  '''
-# ---
diff --git a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_unordered_persons.ambr b/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_unordered_persons.ambr
deleted file mode 100644
index ed7017a3bd26f..0000000000000
--- a/posthog/hogql_queries/insights/funnels/test/__snapshots__/test_funnel_unordered_persons.ambr
+++ /dev/null
@@ -1,278 +0,0 @@
-# serializer version: 1
-# name: TestFunnelUnorderedStepsPersons.test_unordered_funnel_does_not_return_recordings
-  '''
-  SELECT persons.id,
-         persons.id AS id,
-         source.matching_events AS matching_events
-  FROM
-    (SELECT aggregation_target AS actor_id,
-            array() AS matching_events
-     FROM
-       (SELECT aggregation_target AS aggregation_target,
-               steps AS steps,
-               avg(step_1_conversion_time) AS step_1_average_conversion_time_inner,
-               avg(step_2_conversion_time) AS step_2_average_conversion_time_inner,
-               median(step_1_conversion_time) AS step_1_median_conversion_time_inner,
-               median(step_2_conversion_time) AS step_2_median_conversion_time_inner
-        FROM
-          (SELECT aggregation_target AS aggregation_target,
-                  steps AS steps,
-                  max(steps) OVER (PARTITION BY aggregation_target) AS max_steps,
-                                  step_1_conversion_time AS step_1_conversion_time,
-                                  step_2_conversion_time AS step_2_conversion_time
-           FROM
-             (SELECT aggregation_target AS aggregation_target,
-                     timestamp AS timestamp,
-                     step_0 AS step_0,
-                     latest_0 AS latest_0,
-                     uuid_0 AS uuid_0,
-                     `$session_id_0` AS `$session_id_0`,
-                     `$window_id_0` AS `$window_id_0`,
-                     step_1 AS step_1,
-                     latest_1 AS latest_1,
-                     uuid_1 AS uuid_1,
-                     `$session_id_1` AS `$session_id_1`,
-                     `$window_id_1` AS `$window_id_1`,
-                     step_2 AS step_2,
-                     latest_2 AS latest_2,
-                     uuid_2 AS uuid_2,
-                     `$session_id_2` AS `$session_id_2`,
-                     `$window_id_2` AS `$window_id_2`,
-                     arraySort([latest_0, latest_1, latest_2]) AS event_times,
-                     arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                     arraySort([latest_0, latest_1, latest_2]) AS conversion_times,
-                     if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time,
-                     if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        uuid_0 AS uuid_0,
-                        `$session_id_0` AS `$session_id_0`,
-                        `$window_id_0` AS `$window_id_0`,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           last_value(uuid_1) OVER (PARTITION BY aggregation_target
-                                                                    ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_1,
-                                                                   last_value(`$session_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                     ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_1`,
-                                                                                                    last_value(`$window_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                                                     ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_1`,
-                                                                                                                                    step_2 AS step_2,
-                                                                                                                                    min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                                                                                                                                       last_value(uuid_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_2,
-                                                                                                                                                                               last_value(`$session_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                 ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_2`,
-                                                                                                                                                                                                                last_value(`$window_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                 ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_2`
-                 FROM
-                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                           if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                           e.uuid AS uuid,
-                           if(equals(e.event, 'step one'), 1, 0) AS step_0,
-                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                           if(ifNull(equals(step_0, 1), 0), uuid, NULL) AS uuid_0,
-                           if(ifNull(equals(step_0, 1), 0), e.`$session_id`, NULL) AS `$session_id_0`,
-                           if(ifNull(equals(step_0, 1), 0), e.`$window_id`, NULL) AS `$window_id_0`,
-                           if(equals(e.event, 'step two'), 1, 0) AS step_1,
-                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                           if(ifNull(equals(step_1, 1), 0), uuid, NULL) AS uuid_1,
-                           if(ifNull(equals(step_1, 1), 0), e.`$session_id`, NULL) AS `$session_id_1`,
-                           if(ifNull(equals(step_1, 1), 0), e.`$window_id`, NULL) AS `$window_id_1`,
-                           if(equals(e.event, 'step three'), 1, 0) AS step_2,
-                           if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                           if(ifNull(equals(step_2, 1), 0), uuid, NULL) AS uuid_2,
-                           if(ifNull(equals(step_2, 1), 0), e.`$session_id`, NULL) AS `$session_id_2`,
-                           if(ifNull(equals(step_2, 1), 0), e.`$window_id`, NULL) AS `$window_id_2`
-                    FROM events AS e
-                    LEFT OUTER JOIN
-                      (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                              person_distinct_id_overrides.distinct_id AS distinct_id
-                       FROM person_distinct_id_overrides
-                       WHERE equals(person_distinct_id_overrides.team_id, 2)
-                       GROUP BY person_distinct_id_overrides.distinct_id
-                       HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                    WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-              WHERE ifNull(equals(step_0, 1), 0)
-              UNION ALL SELECT aggregation_target AS aggregation_target,
-                               timestamp AS timestamp,
-                               step_0 AS step_0,
-                               latest_0 AS latest_0,
-                               uuid_0 AS uuid_0,
-                               `$session_id_0` AS `$session_id_0`,
-                               `$window_id_0` AS `$window_id_0`,
-                               step_1 AS step_1,
-                               latest_1 AS latest_1,
-                               uuid_1 AS uuid_1,
-                               `$session_id_1` AS `$session_id_1`,
-                               `$window_id_1` AS `$window_id_1`,
-                               step_2 AS step_2,
-                               latest_2 AS latest_2,
-                               uuid_2 AS uuid_2,
-                               `$session_id_2` AS `$session_id_2`,
-                               `$window_id_2` AS `$window_id_2`,
-                               arraySort([latest_0, latest_1, latest_2]) AS event_times,
-                               arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                               arraySort([latest_0, latest_1, latest_2]) AS conversion_times,
-                               if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time,
-                               if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        uuid_0 AS uuid_0,
-                        `$session_id_0` AS `$session_id_0`,
-                        `$window_id_0` AS `$window_id_0`,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           last_value(uuid_1) OVER (PARTITION BY aggregation_target
-                                                                    ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_1,
-                                                                   last_value(`$session_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                     ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_1`,
-                                                                                                    last_value(`$window_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                                                     ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_1`,
-                                                                                                                                    step_2 AS step_2,
-                                                                                                                                    min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                                                                                                                                       last_value(uuid_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_2,
-                                                                                                                                                                               last_value(`$session_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                 ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_2`,
-                                                                                                                                                                                                                last_value(`$window_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                 ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_2`
-                 FROM
-                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                           if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                           e.uuid AS uuid,
-                           if(equals(e.event, 'step two'), 1, 0) AS step_0,
-                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                           if(ifNull(equals(step_0, 1), 0), uuid, NULL) AS uuid_0,
-                           if(ifNull(equals(step_0, 1), 0), e.`$session_id`, NULL) AS `$session_id_0`,
-                           if(ifNull(equals(step_0, 1), 0), e.`$window_id`, NULL) AS `$window_id_0`,
-                           if(equals(e.event, 'step three'), 1, 0) AS step_1,
-                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                           if(ifNull(equals(step_1, 1), 0), uuid, NULL) AS uuid_1,
-                           if(ifNull(equals(step_1, 1), 0), e.`$session_id`, NULL) AS `$session_id_1`,
-                           if(ifNull(equals(step_1, 1), 0), e.`$window_id`, NULL) AS `$window_id_1`,
-                           if(equals(e.event, 'step one'), 1, 0) AS step_2,
-                           if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                           if(ifNull(equals(step_2, 1), 0), uuid, NULL) AS uuid_2,
-                           if(ifNull(equals(step_2, 1), 0), e.`$session_id`, NULL) AS `$session_id_2`,
-                           if(ifNull(equals(step_2, 1), 0), e.`$window_id`, NULL) AS `$window_id_2`
-                    FROM events AS e
-                    LEFT OUTER JOIN
-                      (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                              person_distinct_id_overrides.distinct_id AS distinct_id
-                       FROM person_distinct_id_overrides
-                       WHERE equals(person_distinct_id_overrides.team_id, 2)
-                       GROUP BY person_distinct_id_overrides.distinct_id
-                       HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                    WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-              WHERE ifNull(equals(step_0, 1), 0)
-              UNION ALL SELECT aggregation_target AS aggregation_target,
-                               timestamp AS timestamp,
-                               step_0 AS step_0,
-                               latest_0 AS latest_0,
-                               uuid_0 AS uuid_0,
-                               `$session_id_0` AS `$session_id_0`,
-                               `$window_id_0` AS `$window_id_0`,
-                               step_1 AS step_1,
-                               latest_1 AS latest_1,
-                               uuid_1 AS uuid_1,
-                               `$session_id_1` AS `$session_id_1`,
-                               `$window_id_1` AS `$window_id_1`,
-                               step_2 AS step_2,
-                               latest_2 AS latest_2,
-                               uuid_2 AS uuid_2,
-                               `$session_id_2` AS `$session_id_2`,
-                               `$window_id_2` AS `$window_id_2`,
-                               arraySort([latest_0, latest_1, latest_2]) AS event_times,
-                               arraySum([if(and(ifNull(less(latest_0, latest_1), 0), ifNull(lessOrEquals(latest_1, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), if(and(ifNull(less(latest_0, latest_2), 0), ifNull(lessOrEquals(latest_2, plus(toTimeZone(latest_0, 'UTC'), toIntervalDay(14))), 0)), 1, 0), 1]) AS steps,
-                               arraySort([latest_0, latest_1, latest_2]) AS conversion_times,
-                               if(and(isNotNull(conversion_times[2]), ifNull(lessOrEquals(conversion_times[2], plus(toTimeZone(conversion_times[1], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[1], conversion_times[2]), NULL) AS step_1_conversion_time,
-                               if(and(isNotNull(conversion_times[3]), ifNull(lessOrEquals(conversion_times[3], plus(toTimeZone(conversion_times[2], 'UTC'), toIntervalDay(14))), 0)), dateDiff('second', conversion_times[2], conversion_times[3]), NULL) AS step_2_conversion_time
-              FROM
-                (SELECT aggregation_target AS aggregation_target,
-                        timestamp AS timestamp,
-                        step_0 AS step_0,
-                        latest_0 AS latest_0,
-                        uuid_0 AS uuid_0,
-                        `$session_id_0` AS `$session_id_0`,
-                        `$window_id_0` AS `$window_id_0`,
-                        step_1 AS step_1,
-                        min(latest_1) OVER (PARTITION BY aggregation_target
-                                            ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_1,
-                                           last_value(uuid_1) OVER (PARTITION BY aggregation_target
-                                                                    ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_1,
-                                                                   last_value(`$session_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                     ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_1`,
-                                                                                                    last_value(`$window_id_1`) OVER (PARTITION BY aggregation_target
-                                                                                                                                     ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_1`,
-                                                                                                                                    step_2 AS step_2,
-                                                                                                                                    min(latest_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                        ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS latest_2,
-                                                                                                                                                       last_value(uuid_2) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS uuid_2,
-                                                                                                                                                                               last_value(`$session_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                 ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$session_id_2`,
-                                                                                                                                                                                                                last_value(`$window_id_2`) OVER (PARTITION BY aggregation_target
-                                                                                                                                                                                                                                                 ORDER BY timestamp DESC ROWS BETWEEN UNBOUNDED PRECEDING AND 0 PRECEDING) AS `$window_id_2`
-                 FROM
-                   (SELECT toTimeZone(e.timestamp, 'UTC') AS timestamp,
-                           if(not(empty(e__override.distinct_id)), e__override.person_id, e.person_id) AS aggregation_target,
-                           e.uuid AS uuid,
-                           if(equals(e.event, 'step three'), 1, 0) AS step_0,
-                           if(ifNull(equals(step_0, 1), 0), timestamp, NULL) AS latest_0,
-                           if(ifNull(equals(step_0, 1), 0), uuid, NULL) AS uuid_0,
-                           if(ifNull(equals(step_0, 1), 0), e.`$session_id`, NULL) AS `$session_id_0`,
-                           if(ifNull(equals(step_0, 1), 0), e.`$window_id`, NULL) AS `$window_id_0`,
-                           if(equals(e.event, 'step one'), 1, 0) AS step_1,
-                           if(ifNull(equals(step_1, 1), 0), timestamp, NULL) AS latest_1,
-                           if(ifNull(equals(step_1, 1), 0), uuid, NULL) AS uuid_1,
-                           if(ifNull(equals(step_1, 1), 0), e.`$session_id`, NULL) AS `$session_id_1`,
-                           if(ifNull(equals(step_1, 1), 0), e.`$window_id`, NULL) AS `$window_id_1`,
-                           if(equals(e.event, 'step two'), 1, 0) AS step_2,
-                           if(ifNull(equals(step_2, 1), 0), timestamp, NULL) AS latest_2,
-                           if(ifNull(equals(step_2, 1), 0), uuid, NULL) AS uuid_2,
-                           if(ifNull(equals(step_2, 1), 0), e.`$session_id`, NULL) AS `$session_id_2`,
-                           if(ifNull(equals(step_2, 1), 0), e.`$window_id`, NULL) AS `$window_id_2`
-                    FROM events AS e
-                    LEFT OUTER JOIN
-                      (SELECT argMax(person_distinct_id_overrides.person_id, person_distinct_id_overrides.version) AS person_id,
-                              person_distinct_id_overrides.distinct_id AS distinct_id
-                       FROM person_distinct_id_overrides
-                       WHERE equals(person_distinct_id_overrides.team_id, 2)
-                       GROUP BY person_distinct_id_overrides.distinct_id
-                       HAVING ifNull(equals(argMax(person_distinct_id_overrides.is_deleted, person_distinct_id_overrides.version), 0), 0) SETTINGS optimize_aggregation_in_order=1) AS e__override ON equals(e.distinct_id, e__override.distinct_id)
-                    WHERE and(equals(e.team_id, 2), and(and(greaterOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-01 00:00:00.000000', 6, 'UTC')), lessOrEquals(toTimeZone(e.timestamp, 'UTC'), toDateTime64('2021-01-08 23:59:59.999999', 6, 'UTC'))), in(e.event, tuple('step one', 'step three', 'step two'))), or(ifNull(equals(step_0, 1), 0), ifNull(equals(step_1, 1), 0), ifNull(equals(step_2, 1), 0)))))
-              WHERE ifNull(equals(step_0, 1), 0)))
-        GROUP BY aggregation_target,
-                 steps
-        HAVING ifNull(equals(steps, max(max_steps)), isNull(steps)
-                      and isNull(max(max_steps))))
-     WHERE ifNull(in(steps, [1, 2, 3]), 0)
-     ORDER BY aggregation_target ASC) AS source
-  INNER JOIN
-    (SELECT person.id AS id
-     FROM person
-     WHERE equals(person.team_id, 2)
-     GROUP BY person.id
-     HAVING and(ifNull(equals(argMax(person.is_deleted, person.version), 0), 0), ifNull(less(argMax(toTimeZone(person.created_at, 'UTC'), person.version), plus(now64(6, 'UTC'), toIntervalDay(1))), 0)) SETTINGS optimize_aggregation_in_order=1) AS persons ON equals(persons.id, source.actor_id)
-  ORDER BY persons.id ASC
-  LIMIT 101
-  OFFSET 0 SETTINGS readonly=2,
-                    max_execution_time=60,
-                    allow_experimental_object_type=1,
-                    format_csv_allow_double_quotes=0,
-                    max_ast_elements=4000000,
-                    max_expanded_ast_elements=4000000,
-                    max_bytes_before_external_group_by=0,
-                    allow_experimental_analyzer=1
-  '''
-# ---
diff --git a/posthog/queries/funnels/funnel.py b/posthog/queries/funnels/funnel.py
index 388e81863e59f..e5b45c183377e 100644
--- a/posthog/queries/funnels/funnel.py
+++ b/posthog/queries/funnels/funnel.py
@@ -49,8 +49,8 @@ def get_step_counts_query(self):
                 SELECT aggregation_target, steps, max(steps) over (PARTITION BY aggregation_target {breakdown_clause}) as max_steps {self._get_step_time_names(max_steps)} {self._get_matching_events(max_steps)} {breakdown_clause} {inner_timestamps} {self._get_person_and_group_properties()} FROM (
                         {steps_per_person_query}
                 )
-            ) GROUP BY aggregation_target, steps, max_steps {breakdown_clause}
-            HAVING steps = max_steps
+            ) GROUP BY aggregation_target, steps {breakdown_clause}
+            HAVING steps = max(max_steps)
         """
 
     def get_step_counts_without_aggregation_query(self):
diff --git a/posthog/queries/funnels/funnel_strict.py b/posthog/queries/funnels/funnel_strict.py
index 7560c11113c71..f7115551814d7 100644
--- a/posthog/queries/funnels/funnel_strict.py
+++ b/posthog/queries/funnels/funnel_strict.py
@@ -26,8 +26,8 @@ def get_step_counts_query(self):
                 SELECT aggregation_target, steps, max(steps) over (PARTITION BY aggregation_target {breakdown_clause}) as max_steps {self._get_step_time_names(max_steps)} {breakdown_clause} {inner_timestamps} {self._get_matching_events(max_steps)} {self._get_person_and_group_properties()} FROM (
                         {steps_per_person_query}
                 )
-            ) GROUP BY aggregation_target, steps, max_steps {breakdown_clause}
-            HAVING steps = max_steps
+            ) GROUP BY aggregation_target, steps {breakdown_clause}
+            HAVING steps = max(max_steps)
         """
 
     def get_step_counts_without_aggregation_query(self):
diff --git a/posthog/queries/funnels/funnel_unordered.py b/posthog/queries/funnels/funnel_unordered.py
index 83c4bb52f43af..a7ad5800a5da5 100644
--- a/posthog/queries/funnels/funnel_unordered.py
+++ b/posthog/queries/funnels/funnel_unordered.py
@@ -80,8 +80,8 @@ def get_step_counts_query(self):
                 SELECT aggregation_target, steps, max(steps) over (PARTITION BY aggregation_target {breakdown_clause}) as max_steps {self._get_step_time_names(max_steps)} {breakdown_clause} {inner_timestamps} {self._get_person_and_group_properties()} FROM (
                         {union_query}
                 )
-            ) GROUP BY aggregation_target, steps, max_steps {breakdown_clause}
-            HAVING steps = max_steps
+            ) GROUP BY aggregation_target, steps {breakdown_clause}
+            HAVING steps = max(max_steps)
         """
 
     def get_step_counts_without_aggregation_query(self):