improvement: simplify filter statements further improvement: don't overconstraint filters on related data test: get started on some more complex policy tests