fix some view and add autocomplete
merge