+ fix history saving issues