huge perf improvement + autocomplete