Better support for instance only filtering

AT THE COST OF MY SOUL