functional autocomplete
merge fix