Export form enhancements