added autofill checking