* initial filtering based on query * add changeset * add expect clause to ensure other items are not inluded