added in autocomplete - some bugs remain