Clean up filter behavior handling