Query: rename ..or() into ..add() and ..and_not() into ..remove(), this better reflects actual usage with pipelets