Work on refactoring autocompletes