Fixed exclusion by class
Added support for linking terms that consist of many words