RTGOV-592 Fix search for unresolved situations