[Form] Autolabel - minor fixes