Fix filtering and result processing for expanded retrievals.

Needed to treat instances and overrides as expanded instances.