Fix autocomplete and set payment