Made new filter code generic and applied it to pages types that need it