[[ Bugfix 13887 ]] Fix some internal oddities in the field control
Merge pull request #1416 from runrevfraser/bugfix-13887

[[ Bugfix 13887 ]] Fix some internal oddities in the field control