fix to autocomplete
fix to image