LIB001-519 Update the autocomplete controller