fixing problems with Form data sources