match page fixes