incremental filtering
plus some fixes

4 files changed