BUGFIX
CMSFields improvements