AI-805 Quick fix for missing date fields in form class