Fixed autocomplete (Issue #2)