add autocomplete - with bugs