Searching across diagnostic boundaries

Searching across diagnostic boundaries