save and rerender handling improved