Fixed autocomplete by going back to what I did before