Add Per App Filters (new files) + Fix