Refactor my-auto-complete