Better handle of filter destruction