Or queryedit

The or query is replaced in favour of the bool query.