fix and expand exceptions for span filtering