Fix #2190(filtering): further adjustment to noTerm logic
Merge pull request #2208 from PaulL1/2190_further

Fix #2190(filtering): further adjustment to noTerm logic