Improve/Enhance Query and Filter Tools' statement building

GVH 2.10.  The new query and filter tools are pretty darn easy to use, which is great, however, I need to be able to control each statement operator (and and or) independently of one another, especially between conditions. It would be an improvement if the user could click on each or the operators to choose if it is "and" or "or" and not require the operators to be the same.
Also, the "Find results in ______ where" options change all operators in query statement (including the subclause(s)) instead of just the conditions. The subclauses have there own radio buttons to control the operators.

An example, I need to search sewer pipe that are either  4" or 6" and have a material of Vitrified Clay. Current query statement
Data Source: Sewer Mains
Map Area: All
Find results in Sewer Mains where: All the following must be true

Diameter = 4"
AND 
[Subclause] - Material = Vitrified Clay

AND

Diameter = 6"
AND
[Subclause] - Material = Vitrified Clay

However, you will see this is an impossible statement. Pipes cannot be both 4" and 6", so I recieve zero results. If I change the "Find results in Sewer Mains where" to "At least one of the following is true" (meaning all operators are "OR", then I would recieve result of every pipe that is 4", 6", or Vitrified Clay. not only the 4" and 6" pipes that are also Vitrified Clay.

I need this statement:
Diameter = 4"
AND 
[Subclause] - Material = Vitrified Clay

OR

Diameter = 6"
AND
[Subclause] - Material = Vitrified Clay

This is not possible in the current Query and Filter tools.