improve match view performance. Only query the single match we need