Support for forms with up to 22 fields

Fixes #2314
Merge pull request #2314 from jroper/2314-22-form-fields

Form mapping method supports 18 fields