Fixed some bugs in the NLP tuple matcher.