[Console] Autocomplete cleanups/optimisations