New filter, some bug fixes, test for logical evaluator