autocomplete fixes