Functional Query Builder

[GSTbyMM]

Workflow:
A condition (property:value) gets selected in a query and then selected the AND operator for putting the next condition (property:value) to get in results those blocks where both the conditions (property:value) are present.

Expected:
When a condition (property:value) is already set before selecting the AND operator then it is expected that only those conditions will get displayed (to select), after selecting the AND operator, which are making a combination with the first condition and all others conditions get eliminated (from selection list itself).

Issue faced:
At the time of selecting the second condition after setting the AND operator, all the present conditions get displayed (rather than only those that make a combination with the first condition).

It would be great if we have a functional query builder that can be used for structuring syntax more logically.