diff --git a/src/util/ExpressionUtils.cpp b/src/util/ExpressionUtils.cpp
index fc9a80a5b..76aa89c67 100644
--- a/src/util/ExpressionUtils.cpp
+++ b/src/util/ExpressionUtils.cpp
@@ -139,17 +139,7 @@ Expression *ExpressionUtils::rewriteAgg2VarProp(const Expression *expr) {
 
         return RewriteVisitor::transform(expr,
                                          std::move(matcher),
-                                         std::move(rewriter),
-                                         {Expression::Kind::kFunctionCall,
-                                          Expression::Kind::kTypeCasting,
-                                          Expression::Kind::kAdd,
-                                          Expression::Kind::kMinus,
-                                          Expression::Kind::kMultiply,
-                                          Expression::Kind::kDivision,
-                                          Expression::Kind::kMod,
-                                          Expression::Kind::kPredicate,
-                                          Expression::Kind::kListComprehension,
-                                          Expression::Kind::kReduce});
+                                         std::move(rewriter));
     }
 
 std::unique_ptr<Expression> ExpressionUtils::foldConstantExpr(const Expression *expr) {
diff --git a/tests/tck/features/aggregate/Agg.feature b/tests/tck/features/aggregate/Agg.feature
index c12e1c03e..69948eca0 100644
--- a/tests/tck/features/aggregate/Agg.feature
+++ b/tests/tck/features/aggregate/Agg.feature
@@ -466,6 +466,20 @@ Feature: Basic Aggregate and GroupBy
     Then the result should be, in order, with relax comparison:
       | count | sum | avg  | min  | max  | std  | b1   | b2   | b3   |
       | 0     | 0   | NULL | NULL | NULL | NULL | NULL | NULL | NULL |
+    When executing query:
+      """
+      UNWIND [1,2,3] AS d RETURN d | YIELD 1 IN COLLECT($-.d) AS b
+      """
+    Then the result should be, in order, with relax comparison:
+      | b    |
+      | True |
+    When executing query:
+      """
+      UNWIND [1,2,3] AS d RETURN d | YIELD ANY(l IN COLLECT($-.d) WHERE l==1) AS b
+      """
+    Then the result should be, in order, with relax comparison:
+      | b    |
+      | True |
 
   Scenario: Empty input
     When executing query: