Fix issue #9936, restore filters via resource policy implementation
