Adding IsA filter handling