Adding back in resource_filter logic

This is a request of Roaet's too keep consistancy in all waffles.