Fix bugs in filter code, enable filtering according to -e setting
2 files changed