Move autocomplete from export to source