changes to form filter
Merge branch 'form-field' into staging2