Managed auto complete a bit more