CRM-13966 - Work on autocomplete refactoring