diff --git a/src/Storages/MergeTree/MergeTreeIndexSet.cpp b/src/Storages/MergeTree/MergeTreeIndexSet.cpp
index 9c34a149128..56550ab7f3a 100644
--- a/src/Storages/MergeTree/MergeTreeIndexSet.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexSet.cpp
@@ -1,5 +1,6 @@
 #include <Storages/MergeTree/MergeTreeIndexSet.h>
 
+#include <Interpreters/ActionsDAG.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
@@ -276,7 +277,9 @@ MergeTreeIndexConditionSet::MergeTreeIndexConditionSet(
         filter_actions_dag->getOutputs()[0] = &traverseDAG(*filter_actions_dag_node, filter_actions_dag, context, node_to_result_node);
 
         filter_actions_dag->removeUnusedActions();
+        LOG_DEBUG(&Poco::Logger::get("MergeTreeIndexConditionSet"), "Filter actions DAG:\n{}", filter_actions_dag->dumpDAG());
         actions = std::make_shared<ExpressionActions>(filter_actions_dag);
+        LOG_DEBUG(&Poco::Logger::get("MergeTreeIndexConditionSet"), "Dump actions:\n{}", actions->dumpActions());
     }
     else
     {
@@ -290,7 +293,9 @@ MergeTreeIndexConditionSet::MergeTreeIndexConditionSet(
         traverseAST(expression_ast);
 
         auto syntax_analyzer_result = TreeRewriter(context).analyze(expression_ast, index_sample_block.getNamesAndTypesList());
+        LOG_DEBUG(&Poco::Logger::get("MergeTreeIndexConditionSet"), "expression AST:\n{}", expression_ast->dumpTree());
         actions = ExpressionAnalyzer(expression_ast, syntax_analyzer_result, context).getActions(true);
+        LOG_DEBUG(&Poco::Logger::get("MergeTreeIndexConditionSet"), "Dump actions:\n{}", actions->dumpActions());
     }
 }
 
@@ -351,6 +356,8 @@ const ActionsDAG::Node & MergeTreeIndexConditionSet::traverseDAG(const ActionsDA
     const ContextPtr & context,
     std::unordered_map<const ActionsDAG::Node *, const ActionsDAG::Node *> & node_to_result_node) const
 {
+    // LOG_DEBUG(&Poco::Logger::get(__FUNCTION__), "Traversing node:\n{}", node.dumpDAG());
+
     auto result_node_it = node_to_result_node.find(&node);
     if (result_node_it != node_to_result_node.end())
         return *result_node_it->second;
@@ -457,8 +464,11 @@ const ActionsDAG::Node * MergeTreeIndexConditionSet::operatorFromDAG(const Actio
         if (arguments_size != 1)
             return nullptr;
 
+        auto bit_wrapper_function = FunctionFactory::instance().get("__bitWrapperFunc", context);
+        const auto & bit_wrapper_func_node = result_dag->addFunction(bit_wrapper_function, {arguments[0]}, {});
+
         auto bit_swap_last_two_function = FunctionFactory::instance().get("__bitSwapLastTwo", context);
-        return &result_dag->addFunction(bit_swap_last_two_function, {arguments[0]}, {});
+        return &result_dag->addFunction(bit_swap_last_two_function, {&bit_wrapper_func_node}, {});
     }
     else if (function_name == "and" || function_name == "indexHint" || function_name == "or")
     {