small changes in filtering exceptions