Restrict terms used for visibility settings refs #2703