Added autocomplete
Fixed merge issue