af-fieldset - More updates for switching E=>A