Improved cross App filtering by not quering the App if this was not selected specifically.