diff --git a/go/vt/vtgate/planbuilder/testdata/filter_cases.json b/go/vt/vtgate/planbuilder/testdata/filter_cases.json
index 075ce207767..28dbea53eb8 100644
--- a/go/vt/vtgate/planbuilder/testdata/filter_cases.json
+++ b/go/vt/vtgate/planbuilder/testdata/filter_cases.json
@@ -804,44 +804,15 @@
       "QueryType": "SELECT",
       "Original": "select id from user where (col = 'aa' AND name = 'bb') OR (col = 'cc' AND name = 'dd') OR (col = 'ee' AND name = 'ff') OR (col = 'gg' AND name = 'hh')",
       "Instructions": {
-        "OperatorType": "VindexLookup",
-        "Variant": "MultiEqual",
+        "OperatorType": "Route",
+        "Variant": "Scatter",
         "Keyspace": {
           "Name": "user",
           "Sharded": true
         },
-        "Values": [
-          "('bb', 'dd', 'ff', 'hh')"
-        ],
-        "Vindex": "name_user_map",
-        "Inputs": [
-          {
-            "OperatorType": "Route",
-            "Variant": "IN",
-            "Keyspace": {
-              "Name": "user",
-              "Sharded": true
-            },
-            "FieldQuery": "select `name`, keyspace_id from name_user_vdx where 1 != 1",
-            "Query": "select `name`, keyspace_id from name_user_vdx where `name` in ::__vals",
-            "Table": "name_user_vdx",
-            "Values": [
-              "::name"
-            ],
-            "Vindex": "user_index"
-          },
-          {
-            "OperatorType": "Route",
-            "Variant": "ByDestination",
-            "Keyspace": {
-              "Name": "user",
-              "Sharded": true
-            },
-            "FieldQuery": "select id from `user` where 1 != 1",
-            "Query": "select id from `user` where col = 'aa' and `name` = 'bb' or col = 'cc' and `name` = 'dd' or col = 'ee' and `name` = 'ff' or col = 'gg' and `name` = 'hh'",
-            "Table": "`user`"
-          }
-        ]
+        "FieldQuery": "select id from `user` where 1 != 1",
+        "Query": "select id from `user` where col = 'aa' and `name` = 'bb' or col = 'cc' and `name` = 'dd' or col = 'ee' and `name` = 'ff' or col = 'gg' and `name` = 'hh'",
+        "Table": "`user`"
       },
       "TablesUsed": [
         "user.user"
@@ -862,7 +833,7 @@
           "Sharded": true
         },
         "Values": [
-          "('bb', 'dd', 'ff')"
+          "(VARCHAR(\"bb\"), VARCHAR(\"dd\"), VARCHAR(\"ff\"))"
         ],
         "Vindex": "name_user_map",
         "Inputs": [