Fix previous optimizations
Add simple one-to-many form field