Fix outdated code in migrate_otm1

Some things in the app have changed since the last time this was executed.
Make less common fields optional

Move defaults into code, out of declarative portion