Bug Fixes

Crash fix..
Filtering almost done..