Properly deal with filtered entities in reduced queries.
Filtered entities would still end up in the entities list before.