Fix $or group querying