PAHMA-917: Extended Solution

Extended protection to every field except csids