include cell and other conditions in the snapshot subquery