got the filtering working again. cleaned up dead code. Issue #22