autocomplete logic rebuild - faster, easier