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