Some Fix for Per App Filters