diff --git a/prepare/cards/bfcl.py b/prepare/cards/bfcl.py
index 1b5159937c..2d8ae2ddff 100644
--- a/prepare/cards/bfcl.py
+++ b/prepare/cards/bfcl.py
@@ -5,9 +5,11 @@
 from unitxt.operators import (
     Copy,
     ExecuteExpression,
+    FilterByExpression,
+    FixJsonSchemaOfParameterTypes,
     Set,
 )
-from unitxt.stream_operators import JoinStreams
+from unitxt.stream_operators import DeleteSplits, JoinStreams
 from unitxt.test_utils.card import test_card
 
 base_path = "https://raw.githubusercontent.com/ShishirPatil/gorilla/70b6a4a2144597b1f99d1f4d3185d35d7ee532a4/berkeley-function-call-leaderboard/data/"
@@ -31,9 +33,10 @@
                     on="id",
                     new_stream_name="test",
                 ),
+                DeleteSplits(splits=["questions", "answers"]),
                 Copy(field="question/0/0/content", to_field="query"),
                 Copy(field="function", to_field="tools"),
-                "operators.fix_json_schema",
+                FixJsonSchemaOfParameterTypes(main_field="tools"),
                 # Process ground truth data in this dataset, which is a provided as a list of options per field,
                 # and convert it into a list of explicit tool calls
                 #
@@ -100,11 +103,15 @@
                     on="id",
                     new_stream_name="test",
                 ),
+                DeleteSplits(splits=["questions", "answers"]),
                 Copy(field="question/*/0", to_field="dialog"),
                 Copy(field="function", to_field="tools"),
-                "operators.fix_json_schema",
+                FixJsonSchemaOfParameterTypes(main_field="tools"),
+                FilterByExpression(
+                    expression="all(isinstance(v, dict) for d in ground_truth for k, v in d.items())"
+                ),
                 ExecuteExpression(
-                    expression='[{"name": k, "arguments": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*v.values())]',
+                    expression='[{"name": k, "arguments": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*[[w for w in vval if w != ""] for vval in v.values()])]',
                     to_field="reference_calls",
                     imports_list=["itertools"],
                 ),
@@ -138,52 +145,52 @@
         test_card(card, strict=False)
         add_to_catalog(card, f"cards.bfcl.multi_turn.{subset}_v3", overwrite=True)
 
-        for subset in [
-            "live_relevance",
-            "live_irrelevance",
-        ]:
-            card = TaskCard(
-                loader=LoadJsonFile(
-                    files={
-                        "test": base_path + f"BFCL_v3_{subset}.json",
-                    },
-                    lines=True,
-                    data_classification_policy=["public"],
-                ),
-                preprocess_steps=[
-                    Copy(field="question/*/0", to_field="dialog"),
-                    Copy(field="function", to_field="tools"),
-                    "operators.fix_json_schema",
-                    Set(fields={"reference_calls": []}),
-                ],
-                task="tasks.tool_calling.multi_turn",
-                templates=["templates.tool_calling.multi_turn"],
-                __description__=(
-                    """The Berkeley function calling leaderboard is a live leaderboard to evaluate the ability of different LLMs to call functions (also referred to as tools). We built this dataset from our learnings to be representative of most users' function calling use-cases, for example, in agents, as a part of enterprise workflows, etc. To this end, our evaluation dataset spans diverse categories, and across multiple languages."""
-                ),
-                __title__=f"""Berkeley Function Calling Leaderboard (Multi Turn Setup) - {subset.replace("_", " ").title()} V3""",
-                __tags__={
-                    "annotations_creators": "expert-generated",
-                    "language": ["en"],
-                    "license": "apache-2.0",
-                    "size_categories": ["10K<n<100K"],
-                    "task_categories": [
-                        "question-answering",
-                        "reading-comprehension",
-                        "tool-calling",
-                        "multi-turn-tool-calling",
-                    ],
-                    "task_ids": [
-                        "tool-calling",
-                        "multi-turn-tool-calling",
-                        "reading-comprehension",
-                    ],
+    for subset in [
+        "live_relevance",
+        "live_irrelevance",
+    ]:
+        card = TaskCard(
+            loader=LoadJsonFile(
+                files={
+                    "test": base_path + f"BFCL_v3_{subset}.json",
                 },
-            )
+                lines=True,
+                data_classification_policy=["public"],
+            ),
+            preprocess_steps=[
+                Copy(field="question/*/0", to_field="dialog"),
+                Copy(field="function", to_field="tools"),
+                FixJsonSchemaOfParameterTypes(main_field="tools"),
+                Set(fields={"reference_calls": []}),
+            ],
+            task="tasks.tool_calling.multi_turn",
+            templates=["templates.tool_calling.multi_turn"],
+            __description__=(
+                """The Berkeley function calling leaderboard is a live leaderboard to evaluate the ability of different LLMs to call functions (also referred to as tools). We built this dataset from our learnings to be representative of most users' function calling use-cases, for example, in agents, as a part of enterprise workflows, etc. To this end, our evaluation dataset spans diverse categories, and across multiple languages."""
+            ),
+            __title__=f"""Berkeley Function Calling Leaderboard (Multi Turn Setup) - {subset.replace("_", " ").title()} V3""",
+            __tags__={
+                "annotations_creators": "expert-generated",
+                "language": ["en"],
+                "license": "apache-2.0",
+                "size_categories": ["10K<n<100K"],
+                "task_categories": [
+                    "question-answering",
+                    "reading-comprehension",
+                    "tool-calling",
+                    "multi-turn-tool-calling",
+                ],
+                "task_ids": [
+                    "tool-calling",
+                    "multi-turn-tool-calling",
+                    "reading-comprehension",
+                ],
+            },
+        )
 
-            # Test and add the card to the catalog
-            test_card(card, strict=False)
-            add_to_catalog(card, f"cards.bfcl.multi_turn.{subset}_v3", overwrite=True)
+        # Test and add the card to the catalog
+        test_card(card, strict=False)
+        add_to_catalog(card, f"cards.bfcl.multi_turn.{subset}_v3", overwrite=True)
 
     # card = TaskCard(
     #     loader=LoadJsonFile(
diff --git a/prepare/operators/fix_json_schema.py b/prepare/operators/fix_json_schema.py
index 736570dc86..3e18b12389 100644
--- a/prepare/operators/fix_json_schema.py
+++ b/prepare/operators/fix_json_schema.py
@@ -4,6 +4,7 @@
 operator = RecursiveReplace(
     key="type",
     map_values={
+        "": "object",
         "dict": "object",
         "float": "number",
         "tuple": "array",
diff --git a/src/unitxt/catalog/cards/bfcl/multi_turn/java_v3.json b/src/unitxt/catalog/cards/bfcl/multi_turn/java_v3.json
index b6f37ed16a..0de39fe97a 100644
--- a/src/unitxt/catalog/cards/bfcl/multi_turn/java_v3.json
+++ b/src/unitxt/catalog/cards/bfcl/multi_turn/java_v3.json
@@ -20,6 +20,13 @@
             "on": "id",
             "new_stream_name": "test"
         },
+        {
+            "__type__": "delete_splits",
+            "splits": [
+                "questions",
+                "answers"
+            ]
+        },
         {
             "__type__": "copy",
             "field": "question/*/0",
@@ -30,10 +37,17 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
+        {
+            "__type__": "filter_by_expression",
+            "expression": "all(isinstance(v, dict) for d in ground_truth for k, v in d.items())"
+        },
         {
             "__type__": "execute_expression",
-            "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*v.values())]",
+            "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*[[w for w in vval if w != \"\"] for vval in v.values()])]",
             "to_field": "reference_calls",
             "imports_list": [
                 "itertools"
diff --git a/src/unitxt/catalog/cards/bfcl/multi_turn/javascript_v3.json b/src/unitxt/catalog/cards/bfcl/multi_turn/javascript_v3.json
index c3d7e81b09..3fddfb537c 100644
--- a/src/unitxt/catalog/cards/bfcl/multi_turn/javascript_v3.json
+++ b/src/unitxt/catalog/cards/bfcl/multi_turn/javascript_v3.json
@@ -20,6 +20,13 @@
             "on": "id",
             "new_stream_name": "test"
         },
+        {
+            "__type__": "delete_splits",
+            "splits": [
+                "questions",
+                "answers"
+            ]
+        },
         {
             "__type__": "copy",
             "field": "question/*/0",
@@ -30,10 +37,17 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
+        {
+            "__type__": "filter_by_expression",
+            "expression": "all(isinstance(v, dict) for d in ground_truth for k, v in d.items())"
+        },
         {
             "__type__": "execute_expression",
-            "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*v.values())]",
+            "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*[[w for w in vval if w != \"\"] for vval in v.values()])]",
             "to_field": "reference_calls",
             "imports_list": [
                 "itertools"
diff --git a/src/unitxt/catalog/cards/bfcl/multi_turn/live_irrelevance_v3.json b/src/unitxt/catalog/cards/bfcl/multi_turn/live_irrelevance_v3.json
index 58b8edfdba..4e9395e930 100644
--- a/src/unitxt/catalog/cards/bfcl/multi_turn/live_irrelevance_v3.json
+++ b/src/unitxt/catalog/cards/bfcl/multi_turn/live_irrelevance_v3.json
@@ -21,7 +21,10 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
         {
             "__type__": "set",
             "fields": {
diff --git a/src/unitxt/catalog/cards/bfcl/multi_turn/live_multiple_v3.json b/src/unitxt/catalog/cards/bfcl/multi_turn/live_multiple_v3.json
index 26cea69c1d..7448701678 100644
--- a/src/unitxt/catalog/cards/bfcl/multi_turn/live_multiple_v3.json
+++ b/src/unitxt/catalog/cards/bfcl/multi_turn/live_multiple_v3.json
@@ -20,6 +20,13 @@
             "on": "id",
             "new_stream_name": "test"
         },
+        {
+            "__type__": "delete_splits",
+            "splits": [
+                "questions",
+                "answers"
+            ]
+        },
         {
             "__type__": "copy",
             "field": "question/*/0",
@@ -30,10 +37,17 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
+        {
+            "__type__": "filter_by_expression",
+            "expression": "all(isinstance(v, dict) for d in ground_truth for k, v in d.items())"
+        },
         {
             "__type__": "execute_expression",
-            "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*v.values())]",
+            "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*[[w for w in vval if w != \"\"] for vval in v.values()])]",
             "to_field": "reference_calls",
             "imports_list": [
                 "itertools"
diff --git a/src/unitxt/catalog/cards/bfcl/multi_turn/live_parallel_multiple_v3.json b/src/unitxt/catalog/cards/bfcl/multi_turn/live_parallel_multiple_v3.json
index d99a3aaba4..0b3fc19b89 100644
--- a/src/unitxt/catalog/cards/bfcl/multi_turn/live_parallel_multiple_v3.json
+++ b/src/unitxt/catalog/cards/bfcl/multi_turn/live_parallel_multiple_v3.json
@@ -20,6 +20,13 @@
             "on": "id",
             "new_stream_name": "test"
         },
+        {
+            "__type__": "delete_splits",
+            "splits": [
+                "questions",
+                "answers"
+            ]
+        },
         {
             "__type__": "copy",
             "field": "question/*/0",
@@ -30,10 +37,17 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
+        {
+            "__type__": "filter_by_expression",
+            "expression": "all(isinstance(v, dict) for d in ground_truth for k, v in d.items())"
+        },
         {
             "__type__": "execute_expression",
-            "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*v.values())]",
+            "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*[[w for w in vval if w != \"\"] for vval in v.values()])]",
             "to_field": "reference_calls",
             "imports_list": [
                 "itertools"
diff --git a/src/unitxt/catalog/cards/bfcl/multi_turn/live_parallel_v3.json b/src/unitxt/catalog/cards/bfcl/multi_turn/live_parallel_v3.json
index e2f7bff160..def93e12b4 100644
--- a/src/unitxt/catalog/cards/bfcl/multi_turn/live_parallel_v3.json
+++ b/src/unitxt/catalog/cards/bfcl/multi_turn/live_parallel_v3.json
@@ -20,6 +20,13 @@
             "on": "id",
             "new_stream_name": "test"
         },
+        {
+            "__type__": "delete_splits",
+            "splits": [
+                "questions",
+                "answers"
+            ]
+        },
         {
             "__type__": "copy",
             "field": "question/*/0",
@@ -30,10 +37,17 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
+        {
+            "__type__": "filter_by_expression",
+            "expression": "all(isinstance(v, dict) for d in ground_truth for k, v in d.items())"
+        },
         {
             "__type__": "execute_expression",
-            "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*v.values())]",
+            "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*[[w for w in vval if w != \"\"] for vval in v.values()])]",
             "to_field": "reference_calls",
             "imports_list": [
                 "itertools"
diff --git a/src/unitxt/catalog/cards/bfcl/multi_turn/live_relevance_v3.json b/src/unitxt/catalog/cards/bfcl/multi_turn/live_relevance_v3.json
index b8bbd35491..a2d954b562 100644
--- a/src/unitxt/catalog/cards/bfcl/multi_turn/live_relevance_v3.json
+++ b/src/unitxt/catalog/cards/bfcl/multi_turn/live_relevance_v3.json
@@ -21,7 +21,10 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
         {
             "__type__": "set",
             "fields": {
diff --git a/src/unitxt/catalog/cards/bfcl/multi_turn/live_simple_v3.json b/src/unitxt/catalog/cards/bfcl/multi_turn/live_simple_v3.json
index 23b27a92f1..bd1590a088 100644
--- a/src/unitxt/catalog/cards/bfcl/multi_turn/live_simple_v3.json
+++ b/src/unitxt/catalog/cards/bfcl/multi_turn/live_simple_v3.json
@@ -20,6 +20,13 @@
             "on": "id",
             "new_stream_name": "test"
         },
+        {
+            "__type__": "delete_splits",
+            "splits": [
+                "questions",
+                "answers"
+            ]
+        },
         {
             "__type__": "copy",
             "field": "question/*/0",
@@ -30,10 +37,17 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
+        {
+            "__type__": "filter_by_expression",
+            "expression": "all(isinstance(v, dict) for d in ground_truth for k, v in d.items())"
+        },
         {
             "__type__": "execute_expression",
-            "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*v.values())]",
+            "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*[[w for w in vval if w != \"\"] for vval in v.values()])]",
             "to_field": "reference_calls",
             "imports_list": [
                 "itertools"
diff --git a/src/unitxt/catalog/cards/bfcl/multi_turn/multiple_v3.json b/src/unitxt/catalog/cards/bfcl/multi_turn/multiple_v3.json
index a2f3e55b40..6f95116a9a 100644
--- a/src/unitxt/catalog/cards/bfcl/multi_turn/multiple_v3.json
+++ b/src/unitxt/catalog/cards/bfcl/multi_turn/multiple_v3.json
@@ -20,6 +20,13 @@
             "on": "id",
             "new_stream_name": "test"
         },
+        {
+            "__type__": "delete_splits",
+            "splits": [
+                "questions",
+                "answers"
+            ]
+        },
         {
             "__type__": "copy",
             "field": "question/*/0",
@@ -30,10 +37,17 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
+        {
+            "__type__": "filter_by_expression",
+            "expression": "all(isinstance(v, dict) for d in ground_truth for k, v in d.items())"
+        },
         {
             "__type__": "execute_expression",
-            "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*v.values())]",
+            "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*[[w for w in vval if w != \"\"] for vval in v.values()])]",
             "to_field": "reference_calls",
             "imports_list": [
                 "itertools"
diff --git a/src/unitxt/catalog/cards/bfcl/multi_turn/parallel_multiple_v3.json b/src/unitxt/catalog/cards/bfcl/multi_turn/parallel_multiple_v3.json
index def9eafd39..fabc321a4f 100644
--- a/src/unitxt/catalog/cards/bfcl/multi_turn/parallel_multiple_v3.json
+++ b/src/unitxt/catalog/cards/bfcl/multi_turn/parallel_multiple_v3.json
@@ -20,6 +20,13 @@
             "on": "id",
             "new_stream_name": "test"
         },
+        {
+            "__type__": "delete_splits",
+            "splits": [
+                "questions",
+                "answers"
+            ]
+        },
         {
             "__type__": "copy",
             "field": "question/*/0",
@@ -30,10 +37,17 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
+        {
+            "__type__": "filter_by_expression",
+            "expression": "all(isinstance(v, dict) for d in ground_truth for k, v in d.items())"
+        },
         {
             "__type__": "execute_expression",
-            "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*v.values())]",
+            "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*[[w for w in vval if w != \"\"] for vval in v.values()])]",
             "to_field": "reference_calls",
             "imports_list": [
                 "itertools"
diff --git a/src/unitxt/catalog/cards/bfcl/multi_turn/parallel_v3.json b/src/unitxt/catalog/cards/bfcl/multi_turn/parallel_v3.json
index ca51ee9962..8f09f6a05d 100644
--- a/src/unitxt/catalog/cards/bfcl/multi_turn/parallel_v3.json
+++ b/src/unitxt/catalog/cards/bfcl/multi_turn/parallel_v3.json
@@ -20,6 +20,13 @@
             "on": "id",
             "new_stream_name": "test"
         },
+        {
+            "__type__": "delete_splits",
+            "splits": [
+                "questions",
+                "answers"
+            ]
+        },
         {
             "__type__": "copy",
             "field": "question/*/0",
@@ -30,10 +37,17 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
+        {
+            "__type__": "filter_by_expression",
+            "expression": "all(isinstance(v, dict) for d in ground_truth for k, v in d.items())"
+        },
         {
             "__type__": "execute_expression",
-            "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*v.values())]",
+            "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*[[w for w in vval if w != \"\"] for vval in v.values()])]",
             "to_field": "reference_calls",
             "imports_list": [
                 "itertools"
diff --git a/src/unitxt/catalog/cards/bfcl/multi_turn/simple_v3.json b/src/unitxt/catalog/cards/bfcl/multi_turn/simple_v3.json
index 9e81338345..0996641441 100644
--- a/src/unitxt/catalog/cards/bfcl/multi_turn/simple_v3.json
+++ b/src/unitxt/catalog/cards/bfcl/multi_turn/simple_v3.json
@@ -20,6 +20,13 @@
             "on": "id",
             "new_stream_name": "test"
         },
+        {
+            "__type__": "delete_splits",
+            "splits": [
+                "questions",
+                "answers"
+            ]
+        },
         {
             "__type__": "copy",
             "field": "question/*/0",
@@ -30,10 +37,17 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
+        {
+            "__type__": "filter_by_expression",
+            "expression": "all(isinstance(v, dict) for d in ground_truth for k, v in d.items())"
+        },
         {
             "__type__": "execute_expression",
-            "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*v.values())]",
+            "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*[[w for w in vval if w != \"\"] for vval in v.values()])]",
             "to_field": "reference_calls",
             "imports_list": [
                 "itertools"
diff --git a/src/unitxt/catalog/cards/bfcl/simple_v3.json b/src/unitxt/catalog/cards/bfcl/simple_v3.json
index b68303eb8c..d4cebe10b3 100644
--- a/src/unitxt/catalog/cards/bfcl/simple_v3.json
+++ b/src/unitxt/catalog/cards/bfcl/simple_v3.json
@@ -20,6 +20,13 @@
             "on": "id",
             "new_stream_name": "test"
         },
+        {
+            "__type__": "delete_splits",
+            "splits": [
+                "questions",
+                "answers"
+            ]
+        },
         {
             "__type__": "copy",
             "field": "question/0/0/content",
@@ -30,7 +37,10 @@
             "field": "function",
             "to_field": "tools"
         },
-        "operators.fix_json_schema",
+        {
+            "__type__": "fix_json_schema_of_parameter_types",
+            "main_field": "tools"
+        },
         {
             "__type__": "execute_expression",
             "expression": "[{\"name\": k, \"arguments\": dict(zip(v.keys(), vals))} for d in ground_truth for k, v in d.items() for vals in itertools.product(*v.values())]",
diff --git a/src/unitxt/catalog/operators/fix_json_schema.json b/src/unitxt/catalog/operators/fix_json_schema.json
index 9254ab2b2f..5790cf8df5 100644
--- a/src/unitxt/catalog/operators/fix_json_schema.json
+++ b/src/unitxt/catalog/operators/fix_json_schema.json
@@ -2,6 +2,7 @@
     "__type__": "recursive_replace",
     "key": "type",
     "map_values": {
+        "": "object",
         "dict": "object",
         "float": "number",
         "tuple": "array",