Autocompletion fix for users