Autocomplete working; needs improvement