With merged autofill code