Autocomplete improvement
Split controller