Merge pull request #15822 from vdemeester/docs-update-filtering-ps-and-images

Update filtering chapters on ps/images references