performance enhancments for match view