changed auto-complete so it works