Update match page fixing poor assumptions