Fixed autocomplete not working
Merged