Support $and systemId queries