make auto complete better