LPS-38098 Apply searchContainer pattern (more to come)