Adapt autocompletion to new data form