Merged lazy autocomplete implementation from v1