AutoCompletion adaptions