Adding fix to filter removal