Wrap CFS fields in an if