diff --git a/src/Interpreters/QueryNormalizer.cpp b/src/Interpreters/QueryNormalizer.cpp
index ea61ade2b49d..7c820622c379 100644
--- a/src/Interpreters/QueryNormalizer.cpp
+++ b/src/Interpreters/QueryNormalizer.cpp
@@ -256,6 +256,9 @@ void QueryNormalizer::visit(ASTPtr & ast, Data & data)
         visit(*node_select, ast, data);
     else if (auto * node_param = ast->as<ASTQueryParameter>())
         throw Exception("Query parameter " + backQuote(node_param->name) + " was not set", ErrorCodes::UNKNOWN_QUERY_PARAMETER);
+    else if (auto * node_function = ast->as<ASTFunction>())
+        if (node_function->parameters)
+            visit(node_function->parameters, data);
 
     /// If we replace the root of the subtree, we will be called again for the new root, in case the alias is replaced by an alias.
     if (ast.get() != initial_ast.get())
diff --git a/tests/queries/0_stateless/02006_use_constants_in_with_and_select.reference b/tests/queries/0_stateless/02006_use_constants_in_with_and_select.reference
new file mode 100644
index 000000000000..bbf008ffdf20
--- /dev/null
+++ b/tests/queries/0_stateless/02006_use_constants_in_with_and_select.reference
@@ -0,0 +1,5 @@
+1	[1]
+[1]
+99.9
+0.1	99.9
+[99.9]
diff --git a/tests/queries/0_stateless/02006_use_constants_in_with_and_select.sql b/tests/queries/0_stateless/02006_use_constants_in_with_and_select.sql
new file mode 100644
index 000000000000..daca6c5d0c79
--- /dev/null
+++ b/tests/queries/0_stateless/02006_use_constants_in_with_and_select.sql
@@ -0,0 +1,36 @@
+SELECT
+    1 AS max_size,
+    groupArray(max_size)(col)
+FROM
+    (SELECT col FROM (
+        SELECT 1 AS col
+        UNION ALL
+        SELECT 2
+    ) ORDER BY col);
+
+WITH 1 AS max_size
+SELECT groupArray(max_size)(col)
+FROM
+     (SELECT col FROM (
+         SELECT 1 as col
+         UNION ALL
+         SELECT 2
+     ) ORDER BY col);
+
+WITH 0.1 AS level
+SELECT quantile(level)(number)
+FROM numbers(1000);
+
+SELECT 0.1 AS level, quantile(level)(number)
+FROM numbers(1000);
+
+WITH
+    0.1 AS level,
+    1 AS max_size
+SELECT groupArray(max_size)(col)
+FROM
+    (
+        SELECT quantile(level)(number) AS col
+        FROM numbers(1000)
+    );
+
diff --git a/tests/queries/0_stateless/02354_with_statement_non_exist_column.reference b/tests/queries/0_stateless/02354_with_statement_non_exist_column.reference
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/queries/0_stateless/02354_with_statement_non_exist_column.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02354_with_statement_non_exist_column.sql b/tests/queries/0_stateless/02354_with_statement_non_exist_column.sql
new file mode 100644
index 000000000000..1a989c1d9529
--- /dev/null
+++ b/tests/queries/0_stateless/02354_with_statement_non_exist_column.sql
@@ -0,0 +1,9 @@
+WITH x AS y SELECT 1;
+
+DROP TEMPORARY TABLE IF EXISTS t1;
+DROP TEMPORARY TABLE IF EXISTS t2;
+
+CREATE TEMPORARY TABLE t1 (a Int64);
+CREATE TEMPORARY TABLE t2 (a Int64, b Int64);
+
+WITH b AS bb SELECT bb FROM t2 WHERE a IN (SELECT a FROM t1);