and resolving items are unified. Have rejigged filtering and the filter
tests are passing. Added a test case for empty filters which let everything
through.