Refactoring autocomplete on every target element