file field fixes
group field fixes