Update for matchhistory v2.2

and others