LPS-38098 apply searchContainer pattern