FIX Fixed the beforeUpdateCMSFields and made them consistent