Add filter-only and filter-out
Some trivial performance optimization