Bugg fix in autocomplete