fix autocomplete and search