Update autofill feature

-When only one option, no popup (just autofill)
-When multiple options, popup with list of options, then autofill