MDL-38598 form: Prevent flickering due to advanced fields