Filter Exception restructure