- Added filtering for policies