[BUGFIX] Fix override field handling in form engine