Fix history and pointsByValue