Merge "Initial app filtering logic"