fix null/undefined autofill