Fixed autocomplete issue.
Merge.