Adding properly working autocomplete