LPS-38368 Fix using the new SearchContainer pattern