Changes to auto-complete