Updated autocomplete functions, added wrappers for those as well.