Less restrictive querying

Doesn't simplify queries with duplicate conditions.

Related to #332