Changes to auto_complete