match bug fix; match index view update