Fixed auto complete - now works