Improvements to the automatic form generation feature