improved control autofill