updated autocomplete and minor bug fix