diff --git a/sql/router.go b/sql/router.go
index 8c6035dee..5f01579df 100644
--- a/sql/router.go
+++ b/sql/router.go
@@ -58,7 +58,7 @@ func newRouter() *router {
 	groupByOptional := NewQueryMask(
 		SelectPartField|SelectPartFields|SelectPartCountStar|SelectPartSumField,
 		FromPartTable,
-		WherePartFieldCondition, // TODO: this can probably handle fields as well
+		WherePartFieldCondition|WherePartMultiFieldCondition,
 		GroupByPartField|GroupByPartFields,
 		HavingPartCondition,
 	)