Filter: add FilterNotEqual and FilterMatch

fixes #6557