StructuredQuery: Fixed issue where adding a should clause caused other clauses to be removed