renamed class
autocomplete speed optimisation