Filter Fixes

Sorry for the delay. Got caught up with something else.