fixed snippets, added MatchTerm to model