+ fixing emitter leak, and simplified criteria filter