* Add Match Validator * Address comments and rebase master * Support retrieve index from filter * Fixed UT