Fix autocompletion for several models