improve autocomplete and query param.