latest tweaks to formcontext for csv import