Db/autocomplete enhance