Refactor filtering step to look at items

Check contents of one item but just asset counts for the rest.