fixed saving and autocomplete