Modify matching function to focus on individual match only