Merge "Marks app filtering interactions correctly"