Changed autocomplete solution. Needs work